mirror of
https://github.com/humhub/humhub.git
synced 2025-02-25 11:43:30 +01:00
# 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