merchant: master fd1d4674

Diff Back to Repository
Author Committer Branch Timestamp Parent
Marcello Stanisci Marcello Stanisci master 2016-03-21 16:16 master 9f90e10a
Changeset Merge branch 'master' of ssh://taler.net/var/git/merchant
mod - Makefile.am Diff File
add - copylib/Makefile.am Diff File
mod - examples/blog/web-common Diff File
mod - examples/shop/web-common Diff File
mod - src/backend/Makefile.am Diff File
mod - src/backend/taler-merchant-httpd.c Diff File
mod - src/backend/taler-merchant-httpd_auditors.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_parsing.c Diff File
mod - src/backend/taler-merchant-httpd_parsing.h Diff File
mod - src/backend/taler-merchant-httpd_pay.c Diff File
mod - src/backend/taler-merchant-httpd_util.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
rm - src/lib/merchant_api_json.c Diff File
rm - src/lib/merchant_api_json.h Diff File
mod - src/lib/merchant_api_pay.c Diff File
mod - src/lib/test_merchant_api.c Diff File