Lucas Bartholemy bc5a8ea592 Merge branch 'master' into develop
# Conflicts:
#	composer.json
#	composer.lock
#	protected/humhub/config/common.php
#	protected/humhub/docs/guide/developer/content.md
#	protected/humhub/models/UrlOembed.php
#	protected/humhub/modules/admin/views/setting/basic.php
#	protected/humhub/modules/user/components/PermissionManager.php
#	protected/humhub/widgets/Link.php
#	themes/HumHub/css/theme.css
2019-05-19 13:24:34 +02:00
..
2018-02-25 19:57:48 +01:00