diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-11-07 14:39:15 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-11-07 14:39:15 +0100 |
| commit | 1d740824fa8914e21c402abefc5f3d5a8cdfa4ca (patch) | |
| tree | 74223d7b8931806183f5b5d8b09222c00d8a62c7 /.gitmodules | |
| parent | 6d6a9dac39bd6c24a7d527186aaa2a1eec2d8c36 (diff) | |
| parent | 247b8e33b3ea20407910929c78232ff0d44e8d9a (diff) | |
| download | exchange-1d740824fa8914e21c402abefc5f3d5a8cdfa4ca.tar.xz | |
resolving merge issue
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 7625aa983..381d9c129 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "doc/api"] path = doc/api url = git@git.taler.net:api +[submodule "gnunet"] + path = gnunet + url = git://taler.net/gnunet.git |