Ansariel 36a8432909 Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # scripts/messages/message_template.msg # scripts/messages/message_template.msg.sha1		2025-03-19 15:00:25 +01:00
..
message_template.msg	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-03-19 15:00:25 +01:00
message_template.msg.sha1	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-03-19 15:00:25 +01:00