merchant: master 835a95d7

Author Committer Branch Timestamp Parent
Marcello Stanisci Marcello Stanisci master 2016-12-12 18:35 master e74140ba
Changeset Merge branch '4795'
mod - src/backend/Makefile.am Diff File
mod - src/backend/taler-merchant-httpd.c Diff File
mod - src/backend/taler-merchant-httpd.h Diff File
mod - src/backend/taler-merchant-httpd_contract.c Diff File
add - src/backend/taler-merchant-httpd_map.c Diff File
add - src/backend/taler-merchant-httpd_map.h Diff File
mod - src/backenddb/plugin_merchantdb_postgres.c Diff File
mod - src/backenddb/test_merchantdb.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
mod - src/lib/merchant_api_contract.c Diff File
mod - src/lib/merchant_api_history.c Diff File
add - src/lib/merchant_api_map.c Diff File
mod - src/lib/merchant_api_pay.c Diff File
mod - src/lib/merchant_api_track_transaction.c Diff File
mod - src/lib/merchant_api_track_transfer.c Diff File
mod - src/lib/test_merchant_api.c Diff File
add - src/merchant-tools/Makefile.am Diff File
add - src/merchant-tools/taler-merchant-dbinit Diff File
add - src/merchant-tools/taler-merchant-dbinit.c Diff File