Marcus Moore 0797c4ac97 Merge branch 'develop' into chore/sc-28173 ...

# Conflicts:
#	resources/views/settings/saml.blade.php
#	resources/views/settings/security.blade.php
#	resources/views/setup/user.blade.php

2025-02-10 15:57:41 -08:00

..

assets

Fixes #15017 - card view for mobile

2025-01-17 16:58:30 +00:00

lang

adds channel not found warning

2025-02-04 11:21:56 -08:00

macros

Squashed commit of the following:

2024-11-12 15:39:22 +00:00

views

Merge branch 'develop' into chore/sc-28173

2025-02-10 15:57:41 -08:00