buddh4 975e715995 Merge branch 'v1.3-dev' of https://github.com/humhub/humhub into v1.3-dev
# Conflicts:
#	protected/humhub/config/common.php
#	protected/humhub/docs/CHANGELOG_DEV.md
#	protected/humhub/docs/guide/bundled-software.md
#	protected/humhub/modules/content/widgets/richtext/HumHubRichText.php
#	themes/HumHub/css/theme.css
2018-02-08 14:35:13 +01:00
..