Author |
Committer |
Branch |
Timestamp |
Parent |
Marcello Stanisci |
Marcello Stanisci |
master |
2017-03-07 16:57 |
master a4f578ba |
Changeset |
Merge branch 'master' of taler.net:merchant |
mod - .gitignore |
Diff
File |
mod - ChangeLog |
Diff
File |
mod - doc/manual.texi |
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_exchanges.c |
Diff
File |
mod - src/backend/taler-merchant-httpd_exchanges.h |
Diff
File |
mod - src/backend/taler-merchant-httpd_history.c |
Diff
File |
mod - src/backend/taler-merchant-httpd_pay.c |
Diff
File |
mod - src/backend/taler-merchant-httpd_proposal.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/backenddb/plugin_merchantdb_postgres.c |
Diff
File |
mod - src/lib/test_merchant_api.c |
Diff
File |
mod - src/lib/test_merchant_api.conf |
Diff
File |