|
|
2c732d4062
|
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 |
|
|
|
8fb64b6807
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
baf27fa918
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
abaa447a7b
|
Localization fix
|
2016-07-27 22:20:30 +02:00 |
|
|
|
f19923f292
|
Translation fixes (0 still missing)
|
2016-07-27 13:15:05 +02:00 |
|
|
|
9809b10c65
|
Dynamic language loading
|
2016-07-05 19:00:30 +02:00 |
|
|
|
06ec82deff
|
Language display optimized
see previous commit
|
2016-07-02 14:15:02 +02:00 |
|
|
|
7a4a1ffd7f
|
Directory rename
|
2016-05-19 19:46:39 +02:00 |
|
|
|
4691e6bb58
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
