merchant: master 5e2a9c3f

Author Committer Branch Timestamp Parent
Christian Grothoff Christian Grothoff master 2015-12-20 14:30 master 3659ef6e
Changeset Merge branch 'master' of ssh://taler.net:/var/git/merchant
rm - contrib/merchant.conf Diff File
mod - src/frontend/checkout.php Diff File
mod - src/frontend/fullfillment.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