Ansariel 51f7e7a7d7 Merge branch 'release/2025.08' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llfloatermarketplace.cpp # indra/newview/llviewermessage.cpp # indra/newview/skins/default/xui/en/panel_preferences_move.xml		2025-11-17 23:37:55 +01:00
..
az	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-11-17 23:26:11 +01:00
da	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-10-11 18:51:03 +02:00
de	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-11-17 23:26:11 +01:00
en	Merge branch 'release/2025.08' of https://github.com/secondlife/viewer	2025-11-17 23:37:55 +01:00
es	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-11-17 23:26:11 +01:00
fr	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-11-17 23:26:11 +01:00
it	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-11-17 23:26:11 +01:00
ja	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-11-17 23:26:11 +01:00
pl	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-11-17 23:26:11 +01:00
pt	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-10-11 18:51:03 +02:00
ru	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-11-17 23:26:11 +01:00
tr	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-10-11 18:51:03 +02:00
zh	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-11-17 23:26:11 +01:00