Lucas Bartholemy 359b85fdc9 Merge branch 'master' into v1.3-dev ...

# Conflicts:
#	protected/humhub/components/Theme.php
#	protected/humhub/modules/admin/models/forms/DesignSettingsForm.php
#	protected/humhub/modules/content/resources/js/humhub.content.js
#	protected/humhub/modules/space/modules/manage/views/member/pending-invitations.php
#	protected/humhub/modules/stream/resources/js/humhub.stream.js
#	static/js/humhub/humhub.ui.richtext.js

2018-07-02 11:12:55 +02:00

..

config

…

humhub

Merge branch 'master' into v1.3-dev

2018-07-02 11:12:55 +02:00

modules

…

runtime

…

vendor

…

.htaccess

Better Apache 2.4 support

2018-05-04 00:49:45 +02:00

yii

…

yii.bat

…