|
|
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 |
|
|
|
7beb497b58
|
Adjust database pool name
|
2016-10-29 20:44:52 +02:00 |
|
|
|
450e296bd3
|
Reformatting and new directory (capitalization)
|
2016-05-06 18:24:44 +02:00 |
|
|
|
e24df84e24
|
Remove namespace from scalars
|
2016-01-23 10:17:21 +01:00 |
|
|
|
882754a98d
|
Inspection fixes
|
2015-12-22 23:15:38 +01:00 |
|
|
|
aafab48773
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
