merchant: master 8a7f3119

Diff Back to Repository
Author Committer Branch Timestamp Parent
Christian Grothoff Christian Grothoff master 2016-04-25 01:33 master 04dcab34
Changeset Merge branch 'master' of 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