diff options
| author | Christian Grothoff <grothoff@gnunet.org> | 2024-08-12 10:21:56 +0200 |
|---|---|---|
| committer | Christian Grothoff <grothoff@gnunet.org> | 2024-08-12 10:21:56 +0200 |
| commit | 5f1e4d8459a3de716ba7425bcf530ea56a85fabd (patch) | |
| tree | 7d0f5d9f0836d418409da44a92279117ba9afd8c | |
| parent | 0842535a6e11dc94fb6873173042efc3fcb00724 (diff) | |
| parent | 5de11e6b6c9ff0d3b7261f02a7c2c0792f8107a2 (diff) | |
Merge branch 'master' of git+ssh://git.taler.net/exchange
| -rw-r--r-- | contrib/aml-spa.lock | 2 | ||||
| m--------- | contrib/wallet-core | 0 | ||||
| -rw-r--r-- | debian/taler-auditor.install | 2 | ||||
| m--------- | doc/prebuilt | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/contrib/aml-spa.lock b/contrib/aml-spa.lock index 7bfd8360b..0de787f58 100644 --- a/contrib/aml-spa.lock +++ b/contrib/aml-spa.lock @@ -1 +1 @@ -0.12.8 +0.12.9 diff --git a/contrib/wallet-core b/contrib/wallet-core -Subproject 5934e007f637bd9834a811e67c0a030d7a59f2c +Subproject 8b667974a7c55fe542be8a58b0a9f20e3d62d77 diff --git a/debian/taler-auditor.install b/debian/taler-auditor.install index aa69db519..1f79b7c4a 100644 --- a/debian/taler-auditor.install +++ b/debian/taler-auditor.install @@ -17,7 +17,7 @@ usr/share/info/taler-auditor* usr/share/taler/config.d/auditor* usr/share/taler/sql/auditor/* -usr/share/taler/auditor/spa/* +#usr/share/taler/auditor/spa/* # Configuration debian/etc-taler-auditor/* etc/ diff --git a/doc/prebuilt b/doc/prebuilt -Subproject c1a885ac1f9d9b2fdef19a976bed01dab4f7d85 +Subproject ab2e09b5a3711ab04f1f77f79158cc006cab319 |