Tim Daubenschütz ac07107210 Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark ... Conflicts: js/constants/application_constants.js js/utils/requests.js		2015-11-16 16:38:35 +01:00
..
ascribe_detail	Merge pull request #16 from ascribe/AD-1255-refactor-aclbuttons-form-creatio	2015-11-16 13:50:13 +01:00
cc	Fix comments on PR	2015-10-19 17:24:49 +02:00
cyland	Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark	2015-11-16 16:38:35 +01:00
ikonotv	Merge pull request #17 from ascribe/AD-1259-All-dates-showing-up-as-2014	2015-11-13 09:58:12 +01:00
lumenus	Add Lumenus landing page	2015-11-10 18:49:08 +01:00