Tim Daubenschütz 4302da2f81 Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra		2015-09-23 14:22:09 +02:00
..
api_urls.js	merge 456	2015-09-08 14:42:51 +02:00
application_constants.js	Revert "Revert "acls on 3 levels""	2015-09-22 17:38:25 +02:00
languages.js	change text in signup form	2015-09-22 11:41:10 +02:00