Tim Daubenschütz ab1cab2091 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra ... Clear some merge conflicts and also some wrong merges. BAD GIT!!! Conflicts: js/components/ascribe_forms/property.js js/components/ascribe_uploader/react_s3_fine_uploader_utils.js sass/ascribe_uploader.scss		2015-09-15 13:30:24 +02:00
..
api_urls.js	merge 456	2015-09-08 14:42:51 +02:00
application_constants.js	PR Feedback: Provide source for types, change function validation, fix bool statement in Property.js	2015-09-14 11:36:24 +02:00
languages.js	specify editions generically by whitelabel	2015-07-15 01:40:48 +02:00