diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2023-03-30 14:09:50 +0300 |
|---|---|---|
| committer | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2023-03-30 14:09:50 +0300 |
| commit | 198cd4df09d4d6aa9c5bbb6be9c4395d134f9f13 (patch) | |
| tree | d4b87f39ab6353138594ca153ddadd5b217def00 /scripts/templates | |
| parent | e161b128c7eac6df63b6d9210f3bca6c3cbc77ea (diff) | |
| parent | c7053a6928fd5eafdc935453742e92951ae4e0c1 (diff) | |
Merge branch 'main' into DRTVWR-567
# Conflicts:
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
Diffstat (limited to 'scripts/templates')
0 files changed, 0 insertions, 0 deletions