|
|
2de2b27a1c
|
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 |
|
|
|
7fb00b9d4e
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
4ae2510846
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
7f5e9a8b85
|
Adjust database pool name
|
2016-10-29 20:44:52 +02:00 |
|
|
|
b000f28c70
|
Namespace fixes
|
2016-03-31 21:53:31 +02:00 |
|
|
|
6009d573e4
|
Renaming business to organization
|
2016-02-04 18:43:37 +01:00 |
|
