Godfrey M 3b34654dd7 Merge branch 'develop' into MS_teams_deprecation_update ...

# Conflicts:
#	resources/lang/en-US/admin/settings/message.php

2025-05-05 09:33:32 -07:00

..

assets

remove duplicate input-group color correction from other themes

2025-04-30 16:21:15 -07:00

lang

Merge branch 'develop' into MS_teams_deprecation_update

2025-05-05 09:33:32 -07:00

macros

remove duplicate input-group color correction

2025-04-30 16:16:14 -07:00

views

Merge branch 'develop' into MS_teams_deprecation_update

2025-05-05 09:33:32 -07:00