Ansariel 7cf3d31190 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/newview/app_settings/settings.xml		2025-08-25 20:26:06 +02:00
..
workflows	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-08-25 20:26:06 +02:00
dependabot.yml	Create dependabot.yml for github-actions	2024-04-03 17:10:03 +01:00
labeler.yaml	Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-gltf-development	2024-06-21 19:10:44 +02:00
pull_request_template.md	Add media request to pull_request_template.md (#4440)	2025-07-26 11:29:12 -07:00