|
|
4a95f90207
|
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 |
|
|
|
1c5b097be4
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
b9c1cc4857
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
9387d230bc
|
Renaming
|
2016-05-26 22:54:06 +02:00 |
|
|
|
918ca094aa
|
Fixing upload bugs
|
2016-05-25 22:53:06 +02:00 |
|
|
|
986e05db68
|
Simplyfing layout
|
2016-05-17 20:14:04 +02:00 |
|
|
|
24d7fdc1b9
|
Case fix!
|
2016-03-26 18:59:38 +01:00 |
|
