Andrey Lihatskiy 825cfc2b6a Merge branch 'master' into DRTVWR-507-maint ... # Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp		2020-09-22 23:30:12 +03:00
..
LGPL-licence.txt	…
LICENSE-logos.txt	…
LICENSE-source.txt	…
contributions.txt	Merge branch 'master' into DRTVWR-507-maint	2020-09-22 23:30:12 +03:00
releasenotes-where.txt	…
translations.txt	…