diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:21:55 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:21:55 +0200 |
| commit | 0505c6ebbb9060d215f61884d06f22d64d2aaf6d (patch) | |
| tree | 8e236beed1a7b69d97000f58d9b0ec2294488850 /indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml | |
| parent | 725fc6fa85cf17bd3c52e7e8a9ce75b3ee97b647 (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-534
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
Diffstat (limited to 'indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml')
0 files changed, 0 insertions, 0 deletions