merchant: master d3522a17

Author Committer Branch Timestamp Parent
Christian Grothoff Christian Grothoff master 2017-06-04 03:06 master fc6ee7d0
Changeset fix merge issue: proposal_data -> contract_terms rename
mod - doc/Makefile.am Diff File
mod - doc/manual.texi Diff File
mod - doc/version.texi Diff File
mod - src/backend/taler-merchant-httpd_history.c Diff File
mod - src/backend/taler-merchant-httpd_pay.c Diff File
mod - src/backend/taler-merchant-httpd_proposal.c Diff File
mod - src/backend/taler-merchant-httpd_track-transaction.c Diff File
mod - src/backend/taler-merchant-httpd_track-transfer.c 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/merchant_api_pay.c Diff File
mod - src/lib/merchant_api_proposal.c Diff File
mod - src/lib/test_merchant_api.c Diff File
mod - src/merchant-tools/taler-merchant-generate-payments.c Diff File