Andrey Lihatskiy a4c6c7059f Merge branch 'master' into DRTVWR-516-maint ... # Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llvoicevivox.cpp		2021-06-25 00:51:02 +03:00
..
LGPL-licence.txt	…
LICENSE-logos.txt	…
LICENSE-source.txt	…
contributions.txt	Merge branch 'master' into DRTVWR-516-maint	2021-06-25 00:51:02 +03:00
releasenotes-where.txt	…
translations.txt	…