sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
Files
11b4ffe302e171320c7b763709c859cc16f9180a
ThreadNet-Web/src/i18n
T
History
Weblate 11b4ffe302 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 
Conflicts:
	src/i18n/strings/cs.json
	src/i18n/strings/de_DE.json
	src/i18n/strings/fi.json
	src/i18n/strings/fr.json
	src/i18n/strings/it.json
	src/i18n/strings/nl.json
	src/i18n/strings/ru.json
	src/i18n/strings/th.json
2017-10-12 16:20:59 +00:00
..
strings
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
2017-10-12 16:20:59 +00:00