| Author |
Committer |
Branch |
Timestamp |
Parent |
| Marcello Stanisci |
Marcello Stanisci |
master |
2016-05-04 16:06 |
master a93db26d |
|
|
Changeset |
Merge branch 'master' of ssh://taler.net/var/git/merchant |
| mod - Makefile.am |
Diff
File |
| mod - src/Makefile.am |
Diff
File |
| mod - src/backend/Makefile.am |
Diff
File |
| mod - src/backenddb/Makefile.am |
Diff
File |
| mod - src/backenddb/plugin_merchantdb_postgres.c |
Diff
File |
| mod - src/include/Makefile.am |
Diff
File |
| mod - src/lib/Makefile.am |
Diff
File |
| rm - src/lib/merchant_api_context.c |
Diff
File |
| rm - src/lib/merchant_api_context.h |
Diff
File |
| mod - src/lib/merchant_api_pay.c |
Diff
File |
| rm - src/lib/test-exchange-home/config/exchange-common.conf |
Diff
File |
| rm - src/lib/test-exchange-home/config/exchange-keyup.conf |
Diff
File |
| rm - src/lib/test-exchange-home/master.priv |
Diff
File |
| rm - src/lib/test-exchange-home/sepa.json |
Diff
File |
| rm - src/lib/test_merchant.conf |
Diff
File |
| mod - src/lib/test_merchant_api.c |
Diff
File |
| add - src/lib/test_merchant_api.conf |
Diff
File |
| add - src/lib/test_merchant_api_home/.config/taler/merchant/wire/test.json |
Diff
File |
| add - src/lib/test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv |
Diff
File |
