|
|
532775c66a
|
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 |
|
|
|
a41c633ede
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
3ad0dcbae0
|
Template & lang fixes
|
2016-12-14 21:27:04 +01:00 |
|
|
|
f9ba82cd0d
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
5d33978efc
|
[RiskManagement] Template cleanup
|
2016-11-23 23:50:37 +01:00 |
|
|
|
f1691ed8d9
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
