5 Commits

Author	SHA1	Message	Date
Dennis Eichhorn	251b0be0e4	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	3df95a4e5f	Adjusting copyright	2017-01-26 16:32:45 +01:00
Dennis Eichhorn	d375a3b143	Increase php version requirement	2016-12-07 20:56:15 +01:00
Dennis Eichhorn	b601e246ac	Adjust database pool name	2016-10-29 20:44:52 +02:00
Dennis Eichhorn	c3b3e94100	Workflow draft	2016-07-15 20:15:23 +02:00