merchant: master dfb27f3b

Author Committer Branch Timestamp Parent
Florian Dold Florian Dold master 2016-01-25 14:45 master 81c80fde
Changeset Merge branch 'master' of ssh://taler.net/var/git/merchant
mod - src/frontend_blog/cc_payment.php Diff File
add - src/frontend_blog/essay_cc_pay.php Diff File
mod - src/frontend_blog/essay_contract.php Diff File
mod - src/frontend_blog/essay_fulfillment.php Diff File
mod - src/frontend_blog/essay_pay.php Diff File
mod - src/frontend_blog/index.html Diff File
mod - src/frontend_blog/teaser.php Diff File