|
|
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 |
|
|
|
e97487ae73
|
Translation fixes (0 still missing)
|
2016-07-27 13:17:50 +02:00 |
|
|
|
15fabe8f58
|
Dynamic language loading
|
2016-07-05 19:00:30 +02:00 |
|
|
|
d8062a8618
|
Language display optimized
see previous commit
|
2016-07-02 14:15:02 +02:00 |
|
|
|
4122bb5433
|
Templating
|
2016-06-25 13:57:53 +02:00 |
|
|
|
b49683b786
|
Case fix!
|
2016-03-26 18:59:38 +01:00 |
|
