Dennis Eichhorn 532775c66a Merge remote-tracking branch 'origin/develop' into develop ... # Conflicts: # Draw/Controller.js # Draw/Models/DrawType.enum.js # Draw/Models/Editor.js # Media/Models/UploadFile.php		2017-01-26 16:42:29 +01:00
..
Export	Case fix!	2016-03-26 18:59:38 +01:00
Lang	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
category-list.tpl.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
cause-create.tpl.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
cause-list.tpl.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
cockpit.tpl.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
department-list.tpl.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
process-list.tpl.php	Adjusting copyright	2017-01-26 16:32:45 +01:00
project-list.tpl.php	Adjusting copyright	2017-01-26 16:32:45 +01:00
risk-create.tpl.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
risk-list.tpl.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
risk-single-cause.tpl.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
risk-single-dashboard.tpl.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
risk-single-solution.tpl.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
settings-dashboard.tpl.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
solution-create.tpl.php	Adjusting copyright	2017-01-26 16:32:45 +01:00
solution-list.tpl.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00
unit-list.tpl.php	Merge remote-tracking branch 'origin/develop' into develop	2017-01-26 16:42:29 +01:00