4 Commits

Author	SHA1	Message	Date
Dennis Eichhorn	3a4fdced2b	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	697294b655	Adjusting copyright	2017-01-26 16:32:45 +01:00
Dennis Eichhorn	3ccfaf607a	Increase php version requirement	2016-12-07 20:56:15 +01:00
Dennis Eichhorn	befbe5dc3e	Rest changes	2016-06-11 20:25:55 +02:00