|
|
251b0be0e4
|
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 |
|
|
|
3df95a4e5f
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
d375a3b143
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
b601e246ac
|
Adjust database pool name
|
2016-10-29 20:44:52 +02:00 |
|
|
|
5fe787c6f8
|
Create table draft
|
2016-10-17 21:08:33 +02:00 |
|
|
|
92ec4aae17
|
Fix install
|
2016-10-09 20:07:30 +02:00 |
|
|
|
c3b3e94100
|
Workflow draft
|
2016-07-15 20:15:23 +02:00 |
|