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

# Conflicts:
#	.travis.yml
#	protected/humhub/modules/admin/controllers/UserController.php
#	protected/humhub/modules/comment/models/Comment.php
#	protected/humhub/modules/post/controllers/PostController.php
#	protected/humhub/modules/space/Events.php
#	protected/humhub/modules/user/controllers/AccountController.php
#	protected/humhub/modules/user/models/User.php

2018-03-16 10:44:04 +01:00

..

assets

Production assets build.

2017-12-13 18:24:31 +01:00

css

Production assets build.

2017-12-13 18:24:31 +01:00

img

Added ProseMirror rich text editor.

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

js

Merge branch 'master' into v1.3-dev

2018-03-16 10:44:04 +01:00

less

Merge branch 'master' into v1.3-dev

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

resources

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

2018-01-23 09:50:01 +01:00