|
|
3a4fdced2b
|
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 |
|
|
|
697294b655
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
3ccfaf607a
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
43cd7cbaf7
|
Localization tpl draft
|
2016-11-13 23:14:43 +01:00 |
|
|
|
e05923d8b2
|
Fixing remaining bugs for route-restructure
|
2016-04-09 10:43:09 +02:00 |
|
|
|
4426d95f01
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
