diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-11-23 14:29:07 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-11-23 14:38:32 +0200 |
| commit | 7b7667973b3ecaa857f1013c8084f3159105eec1 (patch) | |
| tree | 66fb3dcb2b2e870cbe1312a17c78961d127db10e /indra/newview/skins/default/xui/en/menu_imchiclet_group.xml | |
| parent | f534e37328e7408b1609c9b78d13c6c749091e53 (diff) | |
DRTVWR-513 Resolved merge conflict from merge with DRTVWR-507
See changes from SL-13119 and SL-13190
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_imchiclet_group.xml')
0 files changed, 0 insertions, 0 deletions