Lucas Bartholemy
955d83be8b
Revert "Merge branch 'v1.3-dev' into master"
...
This reverts commit 895156b2a5113f3ac87a20616e599e37ed853e7a, reversing
changes made to 28acd4040a3a7e84c90520b093eff6e977cb4f82.
2018-01-23 09:40:29 +01:00
Lucas Bartholemy
df538e14e3
Revert "Revert "Merge branch 'v1.3-dev' into master""
...
This reverts commit 834368140af6359eeb075b96127477c4339059d6.
# Conflicts:
# protected/humhub/modules/admin/models/forms/CacheSettingsForm.php
2017-12-22 19:55:12 +01:00
Lucas Bartholemy
834368140a
Revert "Merge branch 'v1.3-dev' into master"
...
This reverts commit d2d45f7d78e54b9dcf81e023af336c5bc064b548, reversing
changes made to 3a2daed62f549a4720741b9cd5a15a83521e08e4.
# Conflicts:
# protected/humhub/docs/guide/admin/asynchronous-tasks.md
2017-12-22 13:49:00 +01:00
Lucas Bartholemy
6d19c7fce7
Fixed bower paths
2017-11-05 21:38:25 +01:00
Lucas Bartholemy
e7e42de41f
Fixed less build paths
2017-01-27 00:27:36 +01:00
Lucas Bartholemy
98f92e2221
Moved root folders (js/css/resources/less) into static folder
2017-01-26 17:44:51 +01:00
