| Author |
Committer |
Branch |
Timestamp |
Parent |
| tg |
tg |
master |
2015-12-21 00:17 |
master 81441752 |
|
|
Changeset |
Merge branch 'master' of taler.net:/var/git/merchant |
| mod - .gitignore |
Diff
File |
| rm - contrib/merchant.conf |
Diff
File |
| mod - src/backend/merchant.conf |
Diff
File |
| mod - src/backend/taler-merchant-httpd.c |
Diff
File |
| mod - src/backend/taler-merchant-httpd_contract.c |
Diff
File |
| mod - src/backend/taler-merchant-httpd_pay.c |
Diff
File |
| mod - src/frontend/checkout.php |
Diff
File |
| add - src/frontend/execute.php |
Diff
File |
| mod - src/frontend/fulfillment.php |
Diff
File |
| mod - src/frontend/generate_taler_contract.php |
Diff
File |
| mod - src/frontend/index.html |
Diff
File |
| mod - src/frontend/pay.php |
Diff
File |
| mod - src/frontend/style.css |
Diff
File |
| mod - src/include/taler_merchant_service.h |
Diff
File |
| mod - src/lib/Makefile.am |
Diff
File |
| mod - src/lib/merchant_api_context.c |
Diff
File |
| mod - src/lib/merchant_api_pay.c |
Diff
File |
| add - src/lib/test-mint-home/config/mint-common.conf |
Diff
File |
| add - src/lib/test-mint-home/config/mint-keyup.conf |
Diff
File |
| add - src/lib/test-mint-home/master.priv |
Diff
File |
| add - src/lib/test-mint-home/sepa.json |
Diff
File |
| add - src/lib/test_merchant.conf |
Diff
File |
| add - src/lib/test_merchant.priv |
Diff
File |
| mod - src/lib/test_merchant_api.c |
Diff
File |
