1
0
mirror of https://github.com/ascribe/onion.git synced 2024-06-16 01:23:18 +02:00
onion/js/components/whitelabel
Tim Daubenschütz 030a86e883 Merge branch 'master' into AP-7-artcity-consignment-wallet
Conflicts:
	js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
	js/components/whitelabel/wallet/wallet_app.js
2016-02-08 10:05:35 +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:05:35 +01:00