|
|
d0f6a2b2c0
|
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 |
|
|
|
8c41124c07
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
7c37cbef22
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
4f37c7f422
|
Translation fixes (0 still missing)
|
2016-07-27 13:15:05 +02:00 |
|
|
|
15fabe8f58
|
Dynamic language loading
|
2016-07-05 19:00:30 +02:00 |
|
|
|
50af0b1b02
|
Added splash navigation
|
2016-07-03 15:29:50 +02:00 |
|
