4 Commits

Author	SHA1	Message	Date
Dennis Eichhorn	d298815613	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
Dennis Eichhorn	732f595d8a	Adjusting copyright	2017-01-26 16:32:45 +01:00
Dennis Eichhorn	723f9a1af1	Increase php version requirement	2016-12-07 20:56:15 +01:00
Dennis Eichhorn	828c9c4adc	Restructure	2015-12-31 18:05:19 +01:00