merchant: master 3421048e

Author Committer Branch Timestamp Parent
Marcello Stanisci Marcello Stanisci master 2016-06-25 16:33 master c6594dbd
Changeset Merge branch '4540' of ssh://taler.net/var/git/merchant into 4540
mod - src/backend/merchant.conf Diff File
mod - src/backend/taler-merchant-httpd.c Diff File
mod - src/backend/taler-merchant-httpd.h Diff File
mod - src/backend/taler-merchant-httpd_contract.c Diff File
mod - src/backend/taler-merchant-httpd_track-transaction.c Diff File
mod - src/include/taler_merchant_service.h Diff File
mod - src/lib/merchant_api_pay.c Diff File
mod - src/lib/merchant_api_track_transaction.c Diff File
mod - src/lib/merchant_api_track_transfer.c Diff File
mod - src/lib/test_merchant_api.c Diff File
mod - src/lib/test_merchant_api.conf Diff File