Ansariel 25b7fd4fa9 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice ... # Conflicts: # .github/workflows/build.yaml # indra/newview/CMakeLists.txt # indra/newview/llspeakers.cpp # indra/newview/llvoicechannel.cpp # indra/newview/llvoicechannel.h # indra/newview/llvoiceclient.cpp # indra/newview/llvoiceclient.h # indra/newview/llvoicewebrtc.cpp		2024-08-10 13:04:14 +02:00
..
workflows	Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice	2024-08-10 13:04:14 +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	Tidy up the PR guidance a bit a make it less clunky (hopefully)	2024-07-17 22:09:25 +01:00