buddh4 10f0d68ae4 Merge branch 'develop' of github.com:humhub/humhub into develop
# Conflicts:
#	protected/humhub/docs/CHANGELOG_DEV.md
#	protected/humhub/modules/space/modules/manage/views/image/crop.php
#	protected/humhub/modules/space/modules/manage/views/image/cropBanner.php
#	protected/humhub/modules/space/widgets/views/header.php
#	protected/humhub/modules/tour/views/tour/welcome.php
#	protected/humhub/modules/user/views/image/crop.php
#	protected/humhub/modules/user/widgets/views/profileHeader.php
#	themes/HumHub/css/theme.css
2019-09-30 21:29:56 +02:00
..