summaryrefslogtreecommitdiff
path: root/indra/newview/icons
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2021-05-01 02:17:35 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2021-05-01 02:17:35 +0300
commit9874d65e54c21db38efe65dfbb9c52f7c9971488 (patch)
tree60b439a413a44f662def4dd7336d7d092a9a58cb /indra/newview/icons
parentc54382b760c24069d979c0a848c2f6248cb37d7d (diff)
Follow-up merge conflict fix
Diffstat (limited to 'indra/newview/icons')
0 files changed, 0 insertions, 0 deletions