summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2022-11-23 13:40:13 +0100
committerChristian Grothoff <christian@grothoff.org>2022-11-23 13:40:13 +0100
commit0429b0cede718e3306e088993023dbe3b47c3382 (patch)
treea23a061faacecfa0837cd4846c87a6f39f6db4af /contrib
parent505ea0a0431d54dd8be76cb6ca6c7846db04d76f (diff)
parentd3b46de9f82574cdb85ae2ad7a7a5cb5390471f2 (diff)
downloadexchange-0429b0cede718e3306e088993023dbe3b47c3382.tar.gz
exchange-0429b0cede718e3306e088993023dbe3b47c3382.tar.bz2
exchange-0429b0cede718e3306e088993023dbe3b47c3382.zip
Merge branch 'master' of git+ssh://git.taler.net/exchange
Diffstat (limited to 'contrib')
-rw-r--r--contrib/Makefile.am2
m---------contrib/gana0
2 files changed, 1 insertions, 1 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 6ad5c8aee..cc1cf4d7f 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -63,7 +63,7 @@ EXTRA_DIST = \
pp/Makefile \
pp/README \
pp/pp-v0.rst \
- pp/conf.py \
+ pp/conf.py.in \
pp/locale/de/LC_MESSAGES/pp.po \
$(rdata_DATA) \
coverage.sh \
diff --git a/contrib/gana b/contrib/gana
-Subproject 212ee0a78adc43cb5c04d6ea96ccc2fe74fed62
+Subproject a4a6b9ba4b2634c56194d53e36344686d7052ce