do not upgrade gana to master on bootstrap

3 files changed, 7 insertions, 5 deletions

diff --git a/bootstrap b/bootstrap
index 1b30b7a8a..4a11e8648 100755
--- a/bootstrap
+++ b/bootstrap
@@ -7,6 +7,12 @@ if ! git --version >/dev/null; then
   exit 1
 fi
 
+
+git submodule update --init
+
+./contrib/gana-update.sh
+
+
 ./contrib/gana.sh
 
 # This is more portable than `which' but comes with
diff --git a/contrib/gana.sh b/contrib/gana.sh
index 1055d778b..0475d7ffb 100755
--- a/contrib/gana.sh
+++ b/contrib/gana.sh
@@ -3,10 +3,6 @@
 # Run from exchange/ main directory.
 set -eu
 
-git submodule update --init
-
 cd contrib/gana
 git pull origin master
 cd ../..
-
-./contrib/gana-update.sh
diff --git a/src/json/json.c b/src/json/json.c
index d0d44058d..e9fbb91f8 100644
--- a/src/json/json.c
+++ b/src/json/json.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014, 2015, 2016, 2020 Taler Systems SA
+  Copyright (C) 2014, 2015, 2016, 2020, 2021 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software