|
|
97a2d34bcc
|
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 |
|
|
|
5f4f073b29
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
cf223a0486
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
36ed0471e1
|
Fixing doc blocks
|
2016-11-06 22:22:07 +01:00 |
|
|
|
13dec3084b
|
Fixing comments and parameter for orm
|
2016-05-14 16:23:17 +02:00 |
|
|
|
c5094186ea
|
Making datamapper static
|
2016-05-14 14:58:33 +02:00 |
|
|
|
e1c3915ce5
|
Doc + Mapper::class implementation
|
2016-03-09 23:11:51 +01:00 |
|
|
|
39c76d19ee
|
Update hard drive failure
|
2016-03-01 19:14:32 +01:00 |
|
