Commit Graph

5 Commits

Author SHA1 Message Date
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
3df95a4e5f Adjusting copyright 2017-01-26 16:32:45 +01:00
d375a3b143 Increase php version requirement 2016-12-07 20:56:15 +01:00
c2b28408de Prepare const visibility 2016-12-07 20:23:04 +01:00
0e0dcd3f9b Creating job, workflow. Removing logger 2016-07-16 15:28:26 +02:00