diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-02-05 22:04:40 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-02-05 22:04:40 +0200 |
commit | e3e1672ac40dd4f1f4e458ed09cd7279f0a45fc3 (patch) | |
tree | 8e64e6074c11005fbb1dac606c176e4470de03e4 /indra/newview/skins/default/xui/fr/menu_people_groups_view.xml | |
parent | aa52c852d600aa6b2ea17cdd86f53972c95cca4a (diff) | |
parent | 6762f60d78277cf27afd8353aa531afb26bd560c (diff) |
Merge branch 'DRTVWR-599-maint-Z' into release/maint-yz
# Conflicts:
# indra/newview/llchiclet.h
Diffstat (limited to 'indra/newview/skins/default/xui/fr/menu_people_groups_view.xml')
0 files changed, 0 insertions, 0 deletions