Commit Graph

8 Commits

Author SHA1 Message Date
deb12cf956 Fix file author and copyright 2017-07-26 17:48:08 +02:00
d681b70490 Remove @author docblock 2017-07-20 18:12:29 +02:00
e5b76b5e6a Bulkl path fix reverse 2017-02-12 21:43:10 +01:00
79ef6505c1 Bulkl path fix 2017-02-12 21:42:39 +01:00
22984d1c83 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
e0d20b9797 Adjusting copyright 2017-01-26 16:32:45 +01:00
5987ab5aed Increase php version requirement 2016-12-07 20:56:15 +01:00
f627dd0fcc Case fix! 2016-03-26 18:59:38 +01:00