vrde b4f1d3d6cc Merge branch 'master' into AD-565-add-landing-page-for-sluice ... Conflicts: js/components/login_container.js		2015-07-13 17:19:23 +02:00
..
api_urls.js	piece + share	2015-07-13 14:10:46 +02:00
application_constants.js	Working on landing	2015-07-13 14:29:20 +02:00
languages.js	removed messages indicating that the email is valid	2015-07-13 14:36:29 +02:00