summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/da/floater_web_content.xml
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2022-05-04 18:52:52 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2022-05-04 18:52:52 +0300
commit59d5443905f406344ed26ac9d226b5a574d5dcf0 (patch)
tree423c9bece2d5650bb968095865ee7b3c6fc801e5 /indra/newview/skins/default/xui/da/floater_web_content.xml
parent29de643ffd09257844156c3414f800d84092d790 (diff)
parentbc7e2fb7e7f7527b522bdf6f4c791f3b660485e2 (diff)
Merge branch 'master' into DRTVWR-544-maint
# Conflicts: # indra/viewer_components/login/lllogin.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/da/floater_web_content.xml')
0 files changed, 0 insertions, 0 deletions