| Author |
Committer |
Branch |
Timestamp |
Parent |
| Florian Dold |
Florian Dold |
master |
2015-12-20 19:47 |
master 5e2a9c3f |
|
|
Changeset |
Merge branch 'master' of ssh://taler.net/var/git/merchant |
| mod - .gitignore |
Diff
File |
| mod - src/backend/merchant.conf |
Diff
File |
| mod - src/backend/taler-merchant-httpd.c |
Diff
File |
| mod - src/include/taler_merchant_service.h |
Diff
File |
| mod - src/lib/Makefile.am |
Diff
File |
| mod - src/lib/merchant_api_context.c |
Diff
File |
| mod - src/lib/merchant_api_pay.c |
Diff
File |
| add - src/lib/test-mint-home/config/mint-common.conf |
Diff
File |
| add - src/lib/test-mint-home/config/mint-keyup.conf |
Diff
File |
| add - src/lib/test-mint-home/master.priv |
Diff
File |
| add - src/lib/test-mint-home/sepa.json |
Diff
File |
| add - src/lib/test_merchant.conf |
Diff
File |
| add - src/lib/test_merchant.priv |
Diff
File |
| mod - src/lib/test_merchant_api.c |
Diff
File |
