merchant: master 9f8b9743

Diff Back to Repository
Author Committer Branch Timestamp Parent
Christian Grothoff Christian Grothoff master 2016-10-15 05:14 master 521aa89e
Changeset resolving merge conflict with Marcello, mostly exactly the same changes
mod - src/backend/taler-merchant-httpd_pay.c Diff File
mod - src/backend/taler-merchant-httpd_track-transaction.c Diff File
mod - src/backenddb/plugin_merchantdb_postgres.c Diff File
mod - src/backenddb/test_merchantdb.c Diff File
mod - src/include/taler_merchantdb_plugin.h Diff File