mirror of
https://github.com/humhub/humhub.git
synced 2025-01-17 14:18:27 +01:00
b0a854db10
# Conflicts: # protected/humhub/modules/admin/controllers/ModuleController.php # protected/humhub/modules/admin/controllers/UserController.php # protected/humhub/modules/admin/widgets/SpaceMenu.php # protected/humhub/modules/content/Events.php # protected/humhub/modules/content/models/Wall.php # protected/humhub/modules/content/models/WallEntry.php # protected/humhub/modules/dashboard/components/actions/DashboardStream.php # protected/humhub/modules/dashboard/tests/codeception/unit/DashboardStreamTest.php # protected/humhub/modules/space/controllers/SpaceController.php # protected/humhub/modules/space/models/Membership.php # protected/humhub/modules/space/widgets/SpaceNameColorInput.php # protected/humhub/tests/codeception/unit/modules/activity/BaseActivityTest.php # protected/humhub/tests/codeception/unit/modules/notification/BaseNotificationTest.php
36 lines
529 B
Plaintext
36 lines
529 B
Plaintext
assets/*
|
|
!assets/.gitignore
|
|
|
|
protected/runtime/*
|
|
!protected/runtime/.gitignore
|
|
|
|
node_modules
|
|
|
|
protected/config/local/*
|
|
!protected/config/local/.gitignore
|
|
|
|
uploads/files/*
|
|
!uploads/files/.gitignore
|
|
!uploads/files/.htaccess
|
|
|
|
uploads/profile_image/*
|
|
!uploads/profile_image/banner
|
|
!uploads/profile_image/.gitignore
|
|
|
|
uploads/profile_image/banner/*
|
|
!uploads/profile_image/banner/.gitignore
|
|
|
|
.htaccess
|
|
nbproject
|
|
.idea/*
|
|
.gitmodules
|
|
/composer.lock
|
|
|
|
themes/*
|
|
!themes/HumHub
|
|
|
|
favicon.ico
|
|
/.settings
|
|
/.buildpath
|
|
/.project
|
|
/protected/vendor/ |