| Author |
Committer |
Branch |
Timestamp |
Parent |
| Marcello Stanisci |
Marcello Stanisci |
master |
2016-09-26 18:50 |
master a99aa6da |
|
Changeset |
Merge branch 'receiver' |
| 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_pay.c |
Diff
File |
| mod - src/backend/taler-merchant-httpd_track-transaction.c |
Diff
File |
| mod - src/lib/merchant_api_track_transaction.c |
Diff
File |
| mod - src/lib/test_merchant_api.c |
Diff
File |
| mod - src/lib/test_merchant_api.conf |
Diff
File |
| add - src/lib/tor_merchant.priv |
Diff
File |