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
..
acl_information_text.js	transfer added	2015-11-19 19:47:33 +01:00
api_urls.js	Remove unused PrizeList store and action	2016-01-13 16:17:31 +01:00
application_constants.js	Merge branch 'master' into AP-7-artcity-consignment-wallet	2016-02-08 10:05:35 +01:00
languages.js	Change instances of "Share" to be "Email"	2015-11-10 11:53:05 +01:00
mime_types.js	Use mime types for input's accept property as safari doesn't play nicely with just the extensions	2015-12-10 17:54:33 +01:00
uploader_constants.js	Increase file size limit to 50GB	2016-01-27 11:32:23 +01:00