user avatar
Merge branch 'master' into R2102
Michael Tross authored
# Conflicts:
#	v2/public/locale/de_DE/account-management.html
#	v2/public/locale/de_DE/disconnected.html
#	v2/public/locale/de_DE/remote-connectivity.po
#	v2/public/locale/en_US/remote-connectivity.po
#	v2/public/locale/en_pseudo/account-management.html
#	v2/public/locale/en_pseudo/disconnected.html
#	v2/public/locale/en_pseudo/temporary-access.html
#	v2/public/locale/nl_NL/account-management.html
#	v2/public/locale/nl_NL/disconnected.html
#	v2/public/locale/nl_NL/remote-connectivity.po
#	v2/public/locale/nl_NL/temporary-access.html
ee3677a5
Name Last commit Last update