|
|
3a4fdced2b
|
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 |
|
|
|
697294b655
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
3ccfaf607a
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
11575213f2
|
Comment added
|
2016-06-11 20:33:43 +02:00 |
|
|
|
22d50dbe6e
|
Organization + calendar fixes/extensions
|
2016-02-14 23:10:58 +01:00 |
|
|
|
d9badeada7
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
