Skip to content
Snippets Groups Projects
Commit ab4d4a48 authored by Andrey Lihatskiy's avatar Andrey Lihatskiy
Browse files

Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360

# Conflicts:
#	indra/newview/app_settings/settings.xml
parents 0505c6eb 0bffd3d3
No related branches found
No related tags found
No related merge requests found
Showing
with 77 additions and 139 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment