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

..

css

fix merge conflict

2017-12-22 14:43:16 +03:00

font/open_sans

Fixed wrong folder paths to fonts in HumHub theme #381

2014-11-10 18:23:33 +01:00

ico

Enh: Added apple-mobile-web-app-* and mobile-web-app-capable meta tags to head.php

2017-10-23 01:49:30 +02:00

img

Initial Notification Rewrite + Markdown posts (experimental).

2017-01-04 14:53:25 +01:00

less

Revert "Revert "Merge branch 'v1.3-dev' into master""

2017-12-22 19:55:12 +01:00

views/layouts

Enh: Added apple-mobile-web-app-* and mobile-web-app-capable meta tags to head.php

2017-10-23 01:49:30 +02:00