Lucas Bartholemy 88dc34955e Merge branch 'master' into v1.3-dev ...

# Conflicts:
#	protected/humhub/components/Module.php
#	protected/humhub/components/ModuleManager.php
#	protected/humhub/config/common.php
#	protected/humhub/modules/content/components/ContentActiveRecord.php
#	protected/humhub/modules/content/models/Content.php
#	protected/humhub/modules/space/behaviors/SpaceModelMembership.php
#	protected/humhub/modules/space/models/Space.php
#	protected/humhub/modules/space/views/space/_layout.php
#	protected/humhub/modules/user/views/profile/_layout.php
#	protected/humhub/tests/codeception/_support/HumHubDbTestCase.php
#	protected/humhub/widgets/ContentTagDropDown.php
#	protected/humhub/widgets/LayoutAddons.php

2018-06-03 22:24:50 +02:00

..

assets

Build production assets

2018-04-11 14:54:24 +02:00

css

…

img

Added ProseMirror rich text editor.

2018-02-08 14:28:55 +01:00

js

Merge branch 'master' into v1.3-dev

2018-06-03 22:24:50 +02:00

less

Merge branch 'master' into v1.3-dev

2018-02-13 19:21:27 +01:00

resources

…