Tim Daubenschütz f78dbf9e1a Merge remote-tracking branch 'origin/master' into AD-887-list-contracts-in-settings ... Conflicts: js/components/ascribe_forms/property.js		2015-09-14 14:23:36 +02:00
..
api_urls.js
application_constants.js
languages.js