Michael Telatynski eb536ff2f7 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault ...

 Conflicts:

	src/components/views/dialogs/CreateRoomDialog.js

	src/components/views/dialogs/InviteDialog.js

	src/components/views/right_panel/UserInfo.js

	src/createRoom.js

2020-06-03 10:51:17 +01:00

..

ar.json

…

az.json

…

basefile.json

…

be.json

…

bg.json

Translated using Weblate (Bulgarian)

2020-06-02 09:14:18 +00:00

bn_BD.json

…

bn_IN.json

…

bs.json

…

ca.json

…

cs.json

Translated using Weblate (Czech)

2020-05-31 20:17:21 +00:00

cy.json

…

da.json

…

de_DE.json

Translated using Weblate (German)

2020-05-25 21:29:31 +00:00

el.json

…

en_EN.json

Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault

2020-06-03 10:51:17 +01:00

en_US.json

…

eo.json

Translated using Weblate (Esperanto)

2020-05-31 20:17:22 +00:00

es.json

…

et.json

Translated using Weblate (Estonian)

2020-05-22 09:47:50 +00:00

eu.json

Translated using Weblate (Basque)

2020-05-23 10:20:07 +00:00

fa.json

…

fi.json

Translated using Weblate (Finnish)

2020-06-01 16:25:48 +00:00

fr.json

Translated using Weblate (French)

2020-05-31 20:17:22 +00:00

ga.json

…

gl.json

Translated using Weblate (Galician)

2020-06-02 09:14:19 +00:00

he.json

…

hi.json

…

hr.json

…

hu.json

Translated using Weblate (Hungarian)

2020-06-01 16:25:48 +00:00

id.json

…

is.json

…

it.json

Translated using Weblate (Italian)

2020-06-01 16:25:48 +00:00

ja.json

Translated using Weblate (Japanese)

2020-05-29 14:34:06 +00:00

jbo.json

…

ka.json

…

ko.json

…

lt.json

Translated using Weblate (Lithuanian)

2020-05-29 19:16:19 +00:00

lv.json

…

ml.json

…

mn.json

…

nb_NO.json

Translated using Weblate (Norwegian Bokmål)

2020-05-26 19:49:55 +00:00

ne.json

…

nl.json

Translated using Weblate (Dutch)

2020-05-25 12:48:26 +00:00

nn.json

Translated using Weblate (Norwegian Nynorsk)

2020-06-01 16:25:48 +00:00

oc.json

…

pl.json

…

pt_BR.json

…

pt.json

…

ro.json

…

ru.json

…

sco.json

…

sk.json

Translated using Weblate (Slovak)

2020-05-29 14:34:07 +00:00

sl.json

…

sq.json

Translated using Weblate (Albanian)

2020-05-31 20:17:20 +00:00

sr_Latn.json

…

sr.json

…

sv.json

Translated using Weblate (Swedish)

2020-06-02 12:29:56 +00:00

ta.json

…

te.json

…

th.json

…

tr.json

…

uk.json

Translated using Weblate (Ukrainian)

2020-05-25 12:48:39 +00:00

vi.json

…

vls.json

…

zh_Hans.json

…

zh_Hant.json

Translated using Weblate (Chinese (Traditional))

2020-05-31 20:17:20 +00:00