4 Commits

Author	SHA1	Message	Date
Dennis Eichhorn	4a95f90207	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	1c5b097be4	Adjusting copyright	2017-01-26 16:32:45 +01:00
Dennis Eichhorn	b9c1cc4857	Increase php version requirement	2016-12-07 20:56:15 +01:00
Dennis Eichhorn	b68fc816ee	Init	2015-11-29 21:57:18 +01:00