Ansariel 0514918bed Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/app_settings/settings.xml # scripts/messages/message_template.msg.sha1		2023-09-21 18:34:10 +02:00
..
message_template.msg	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer	2023-09-21 18:34:10 +02:00
message_template.msg.sha1	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer	2023-09-21 18:34:10 +02:00