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
..
2017-09-21 16:52:35 +02:00
2017-12-13 18:24:31 +01:00
2017-03-27 22:47:47 +02:00
2017-12-22 14:46:29 +03:00