| Author |
Committer |
Branch |
Timestamp |
Parent |
| Christian Grothoff |
Christian Grothoff |
master |
2015-12-24 22:30 |
master 33f69ee1 |
|
|
Changeset |
Merge branch 'master' of ssh://taler.net:/var/git/merchant |
| mod - src/backend/merchant.conf |
Diff
File |
| mod - src/backend/taler-merchant-httpd_contract.c |
Diff
File |
| mod - src/backend/taler-merchant-httpd_mints.c |
Diff
File |
| mod - src/backend/taler-merchant-httpd_pay.c |
Diff
File |
| mod - src/backenddb/plugin_merchantdb_postgres.c |
Diff
File |
| mod - src/frontend/checkout.php |
Diff
File |
| add - src/frontend/execute.js |
Diff
File |
| mod - src/frontend/execute.php |
Diff
File |
| add - src/frontend/execute.tsx |
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/include/taler_merchantdb_plugin.h |
Diff
File |
| add - src/tsconfig.json |
Diff
File |
