merchant: master fb7e96e9

Diff Back to Repository
Author Committer Branch Timestamp Parent
Christian Grothoff Christian Grothoff master 2016-04-30 12:58 master 17bf5e3a
Changeset Merge branch 'master' of git+ssh://taler.net/var/git/merchant
mod - bootstrap Diff File
mod - configure.ac Diff File
mod - copylib/util.php Diff File
add - examples/blog/README Diff File
mod - examples/blog/essay_fulfillment.php Diff File
mod - examples/blog/essay_pay.php Diff File
add - examples/blog/nginx_example.conf Diff File
mod - examples/shop/README Diff File
mod - examples/shop/fulfillment.php Diff File
mod - examples/shop/generate_taler_contract.php Diff File
mod - examples/shop/index.php Diff File
mod - examples/shop/pay.php Diff File
mod - src/backend/merchant.conf Diff File
rm - src/backend/myconf.sh Diff File
mod - src/backend/taler-merchant-httpd.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/backenddb/Makefile.am Diff File
mod - src/backenddb/plugin_merchantdb_postgres.c Diff File
add - src/backenddb/test-merchantdb-postgres.conf Diff File
rm - src/backenddb/test_backenddb.c Diff File
add - src/backenddb/test_merchantdb.c Diff File
mod - src/include/taler_merchantdb_plugin.h Diff File