merchant: master a0238028

Diff Back to Repository
Author Committer Branch Timestamp Parent
Christian Grothoff Christian Grothoff master 2016-05-19 20:26 master 3e89bd2f
Changeset Merge branch 'master' of git.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/backend/taler-merchant-httpd_auditors.c Diff File
mod - src/backend/taler-merchant-httpd_contract.c Diff File
mod - src/backend/taler-merchant-httpd_exchanges.c Diff File
mod - src/backend/taler-merchant-httpd_pay.c Diff File
mod - src/backend/taler-merchant-httpd_pay.h Diff File
mod - src/backend/taler-merchant-httpd_util.c Diff File
add - src/backend/test-merchant.conf Diff File
mod - src/backenddb/plugin_merchantdb_postgres.c Diff File
mod - src/include/taler_merchant_service.h Diff File
mod - src/include/taler_merchantdb_plugin.h Diff File
mod - src/lib/Makefile.am Diff File
add - src/lib/merchant_api_contract.c Diff File
mod - src/lib/merchant_api_pay.c Diff File
mod - src/lib/test_merchant_api.c Diff File
mod - src/lib/test_merchant_api.conf Diff File