|
|
3e8838eb94
|
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 |
|
|
|
fb1dd8d15e
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
d53f224783
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
ac08d91d1f
|
Unit test fixes
|
2016-04-22 17:44:28 +02:00 |
|
|
|
85d6824831
|
Modify fix
|
2016-03-13 21:46:37 +01:00 |
|
|
|
70e342fa06
|
Draft ProjectManagement and EventManagement models
|
2016-03-13 00:14:39 +01:00 |
|
