Tim Daubenschütz e69dc21518 Merge branch 'master' into AP-7-artcity-consignment-wallet ... Ok, it was my fault... Conflicts: js/components/whitelabel/wallet/wallet_app.js		2016-02-08 10:09:14 +01:00
..
prize	Use the 'ascribe-app' class for all apps	2016-02-05 14:22:42 +01:00
wallet	Merge branch 'master' into AP-7-artcity-consignment-wallet	2016-02-08 10:09:14 +01:00