mirror of
https://github.com/humhub/humhub.git
synced 2025-01-17 06:08:21 +01:00
975e715995
# 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