merchant: master 1e936a74

Author Committer Branch Timestamp Parent
Marcello Stanisci Marcello Stanisci master 2016-01-20 19:16 master e72726c5
Changeset Merge branch 'master' of ssh://taler.net/var/git/merchant
mod - src/frontend/index.html Diff File
add - src/frontend/taler-presence.js Diff File