1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
onion/js/components/whitelabel/wallet/components
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
..
23vivi Merge branch 'master' into AP-7-artcity-consignment-wallet 2016-02-08 10:05:35 +01:00
artcity Merge branch 'master' into AP-7-artcity-consignment-wallet 2016-02-08 10:05:35 +01:00
ascribe_detail Add better PropType validation for components 2016-02-05 11:53:33 +01:00
cc Update CC routes for loading user and whitelabel settings in top level app 2016-01-11 16:28:27 +01:00
cyland Remove unused Cyland hero component 2016-02-05 11:54:02 +01:00
ikonotv Add better PropType validation for components 2016-02-05 11:53:33 +01:00
lumenus Merge branch 'master' into AP-7-artcity-consignment-wallet 2016-02-08 10:05:35 +01:00
market Add better PropType validation for components 2016-02-05 11:53:33 +01:00
polline Add routes and styling for polline.ascribe.io 2016-02-04 10:54:38 +01:00