5 Commits

Author	SHA1	Message	Date
Dennis Eichhorn	286a9c24fe	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	f0687e8e6c	Adjusting copyright	2017-01-26 16:32:45 +01:00
Dennis Eichhorn	e085879851	Increase php version requirement	2016-12-07 20:56:15 +01:00
Dennis Eichhorn	a6ef9561af	Calendar doc comments	2016-02-11 22:29:33 +01:00
Dennis Eichhorn	7d02549bcc	Cleanup and function pull out	2016-01-30 22:13:15 +01:00