Author |
Committer |
Branch |
Timestamp |
Parent |
Christian Grothoff |
Christian Grothoff |
master |
2016-05-31 19:31 |
master e76a7e19 |
Changeset |
Merge branch 'master' of git+ssh://taler.net/var/git/merchant |
mod - src/backend/Makefile.am |
Diff
File |
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_exchanges.c |
Diff
File |
mod - src/backend/taler-merchant-httpd_mhd.c |
Diff
File |
mod - src/backend/taler-merchant-httpd_parsing.c |
Diff
File |
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_responses.h |
Diff
File |
add - src/backend/taler-merchant-httpd_track.c |
Diff
File |
mod - src/backend/taler-merchant-httpd_track.h |
Diff
File |
rm - src/backend/taler-merchant-httpd_util.c |
Diff
File |
mod - src/include/taler_merchant_service.h |
Diff
File |
mod - src/lib/Makefile.am |
Diff
File |
mod - src/lib/merchant_api_contract.c |
Diff
File |
mod - src/lib/merchant_api_pay.c |
Diff
File |
add - src/lib/merchant_api_track.c |
Diff
File |
mod - src/lib/test_merchant_api.c |
Diff
File |
mod - src/tests/test_contract.c |
Diff
File |