|
|
3dce57e942
|
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 |
|
|
|
23204c884c
|
Make es6 adjustments
|
2017-01-26 16:34:34 +01:00 |
|
|
|
baf4c5dd17
|
[Draw] working mini draft
|
2016-11-23 23:48:27 +01:00 |
|
|
|
6bdc90c65e
|
Fixing draw and drafting create
|
2016-11-09 21:14:16 +01:00 |
|
|
|
73db2a96aa
|
Use strict
|
2016-07-05 18:11:33 +02:00 |
|
|
|
a49ae97b33
|
Removing unused parameter
|
2016-06-04 18:32:53 +02:00 |
|
|
|
6462260d5a
|
Split
|
2015-12-18 17:43:42 +01:00 |
|
