4 Commits

Author	SHA1	Message	Date
Dennis Eichhorn	8a031bdca1	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	cf73d7b282	Adjusting copyright	2017-01-26 16:32:45 +01:00
Dennis Eichhorn	9247f190ab	Increase php version requirement	2016-12-07 20:56:15 +01:00
Dennis Eichhorn	c352b9f9c5	Case fix!	2016-03-26 18:59:38 +01:00