mirror of
https://github.com/humhub/humhub.git
synced 2025-02-06 08:19:03 +01:00
8a736d1c81
# Conflicts: # protected/humhub/config/common.php # protected/humhub/modules/content/components/actions/ContentContainerStream.php # protected/humhub/modules/space/models/Membership.php # protected/humhub/modules/space/views/space/home.php # protected/humhub/modules/stream/actions/Stream.php # protected/humhub/modules/stream/widgets/StreamViewer.php # protected/humhub/modules/user/models/User.php # protected/humhub/tests/codeception/acceptance/modules/user/LoginCept.php # themes/HumHub/css/theme.css
36 lines
511 B
Plaintext
36 lines
511 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
|