mirror of
https://github.com/humhub/humhub.git
synced 2025-01-17 14:18:27 +01:00
de6cb8271b
# Conflicts: # protected/humhub/modules/activity/widgets/views/activityStream.php # protected/humhub/modules/content/components/ContentActiveRecord.php # protected/humhub/modules/content/models/ContentTag.php # protected/humhub/modules/content/tests/codeception/_support/_generated/UnitTesterActions.php # protected/humhub/modules/content/widgets/ContentTagDropDown.php # protected/humhub/modules/dashboard/components/actions/DashboardStream.php # protected/humhub/modules/dashboard/controllers/DashboardController.php # protected/humhub/modules/dashboard/views/dashboard/index.php # protected/humhub/modules/friendship/models/Friendship.php # protected/humhub/modules/space/modules/manage/views/default/index.php # protected/humhub/modules/space/views/space/_layout.php # protected/humhub/modules/stream/actions/Stream.php # protected/humhub/modules/stream/widgets/StreamViewer.php # protected/humhub/modules/ui/Module.php # protected/humhub/modules/ui/config.php # protected/humhub/modules/ui/module.json # protected/humhub/modules/user/models/GroupPermission.php # protected/humhub/tests/codeception/_support/FunctionalTester.php # protected/humhub/widgets/BasePickerField.php # protected/humhub/widgets/BootstrapComponent.php # protected/humhub/widgets/ContentTagDropDown.php # protected/humhub/widgets/InputWidget.php # protected/humhub/widgets/JsWidget.php # protected/humhub/widgets/Label.php # protected/humhub/widgets/LayoutAddons.php # protected/humhub/widgets/MultiSelectField.php # static/js/humhub/humhub.ui.modal.js # static/js/jquery.pjax.modified.js # themes/HumHub/css/theme.css