Tim Daubenschütz 373d9d13a7 Merge branch 'master' into AP-6-polline-consignment-wallet ... Conflicts: js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js js/components/whitelabel/wallet/wallet_app.js		2016-02-08 10:03:06 +01:00
..
acl_information_text.js
api_urls.js
application_constants.js	Merge branch 'master' into AP-6-polline-consignment-wallet	2016-02-08 10:03:06 +01:00
languages.js
mime_types.js
uploader_constants.js