|
|
e05db1e491
|
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 |
|
|
|
15dd51370d
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
f7159379fb
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
5eed599f1c
|
Fixing remaining bugs for route-restructure
|
2016-04-09 10:42:22 +02:00 |
|
|
|
b0316ce3cd
|
Templating
|
2016-01-09 19:46:27 +01:00 |
|
|
|
6ec04a2ec1
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
|
|
858c43a95f
|
Templating
|
2015-12-19 19:35:25 +01:00 |
|
|
|
a0fa6300ad
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
