merchant: master b79fdc1a

Author Committer Branch Timestamp Parent
Marcello Stanisci Marcello Stanisci master 2016-10-21 12:37 master 87082a8d
Changeset Merge branch 'master' of taler.net:merchant
mod - src/backend/taler-merchant-httpd_pay.c Diff File
mod - src/backend/taler-merchant-httpd_responses.c Diff File
mod - src/backend/taler-merchant-httpd_track-transaction.c Diff File
mod - src/backend/taler-merchant-httpd_track-transfer.c Diff File
mod - src/include/taler_merchant_service.h Diff File
mod - src/lib/merchant_api_contract.c Diff File
mod - src/lib/merchant_api_history.c 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