mirror of
https://github.com/humhub/humhub.git
synced 2025-01-17 14:18:27 +01:00
ddb466f858
# Conflicts: # js/app.js # protected/humhub/config/common.php # protected/humhub/modules/admin/messages/ar/views_setting_index.php # protected/humhub/modules/admin/messages/bg/views_setting_index.php # protected/humhub/modules/admin/messages/cs/views_setting_index.php # protected/humhub/modules/admin/messages/da/views_setting_index.php # protected/humhub/modules/admin/messages/de/views_setting_index.php # protected/humhub/modules/admin/messages/es/views_setting_index.php # protected/humhub/modules/admin/messages/fa_ir/views_setting_index.php # protected/humhub/modules/admin/messages/fr/views_setting_index.php # protected/humhub/modules/admin/messages/id/views_setting_index.php # protected/humhub/modules/admin/messages/it/views_setting_index.php # protected/humhub/modules/admin/messages/lt/views_setting_index.php # protected/humhub/modules/admin/messages/nb_no/views_setting_index.php # protected/humhub/modules/admin/messages/nl/views_setting_index.php # protected/humhub/modules/admin/messages/pl/views_setting_index.php # protected/humhub/modules/admin/messages/pt_br/views_setting_index.php # protected/humhub/modules/admin/messages/ro/views_setting_index.php # protected/humhub/modules/admin/messages/th/views_setting_index.php # protected/humhub/modules/admin/messages/tr/views_setting_index.php # protected/humhub/modules/content/components/actions/Stream.php # protected/humhub/modules/content/messages/nb_no/widgets_views_deleteLink.php # protected/humhub/modules/file/models/File.php # protected/humhub/modules/file/widgets/views/showFiles.php # themes/HumHub/css/theme.css