|
|
daa39bfc89
|
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 |
|
|
|
e254aef924
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
49f480f59a
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
2f379c222d
|
Core adjustments for pending issues
|
2016-10-02 12:07:05 +02:00 |
|
|
|
efaecf1d8a
|
Fixing remaining bugs for route-restructure
|
2016-04-09 10:42:22 +02:00 |
|
|
|
39b286af7b
|
Return is array and not an object
|
2016-02-06 18:18:23 +01:00 |
|
|
|
e6f8466085
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
