diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-03-19 16:23:48 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-03-19 16:23:48 +0100 |
commit | c332698763e6f9b80e3539029402ddbc1c9e8900 (patch) | |
tree | f07feeb4461f7d9a5be393aaa669a9eab17db83a /Makefile.am | |
parent | 6f2f6b3ec4b0819041b17035ae849cdfdbbd41b4 (diff) | |
parent | 727cf7f795c7fe7bf8a02d1b3085f5cd47ce3674 (diff) | |
download | merchant-c332698763e6f9b80e3539029402ddbc1c9e8900.tar.gz merchant-c332698763e6f9b80e3539029402ddbc1c9e8900.tar.bz2 merchant-c332698763e6f9b80e3539029402ddbc1c9e8900.zip |
Merge branch 'master' of ssh://taler.net/var/git/merchant
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions