mirror of
https://github.com/humhub/humhub.git
synced 2025-01-18 06:38:14 +01:00
359b85fdc9
# Conflicts: # protected/humhub/components/Theme.php # protected/humhub/modules/admin/models/forms/DesignSettingsForm.php # protected/humhub/modules/content/resources/js/humhub.content.js # protected/humhub/modules/space/modules/manage/views/member/pending-invitations.php # protected/humhub/modules/stream/resources/js/humhub.stream.js # static/js/humhub/humhub.ui.richtext.js
41 lines
601 B
Plaintext
41 lines
601 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
|
|
.github
|
|
|
|
themes/*
|
|
!themes/HumHub
|
|
|
|
favicon.ico
|
|
/.settings
|
|
/.buildpath
|
|
/.project
|
|
/protected/vendor/
|
|
|
|
**/tests/codeception/_support/_generated/**
|
|
|
|
**/tests/codeception/_output/**
|