diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 23:57:11 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 23:57:11 +0300 |
| commit | 53ed0ec70ce5c774c57c9783050c7e1b35885eec (patch) | |
| tree | 62015d4736d86dc1cebc378ff59c33b1e01f42bc /indra/newview/skins/default/xui/tr/floater_perms_default.xml | |
| parent | 784436a5b89062df69251c9ac28904f06a018011 (diff) | |
| parent | 5a70639b7992842a9f74ec81b11bac56608b8f2e (diff) | |
Merge branch 'main' into DRTVWR-567
# Conflicts:
# doc/contributions.txt
Diffstat (limited to 'indra/newview/skins/default/xui/tr/floater_perms_default.xml')
0 files changed, 0 insertions, 0 deletions