Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update from Weblate. #5369

Merged
merged 10 commits into from
Oct 20, 2017
+38 −10
Merged

Update from Weblate. #5369

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4a5e2e3
Translated using Weblate (German)
bamstam Oct 3, 2017
b71bcb4
Merge remote-tracking branch 'origin/develop' into develop
Oct 15, 2017
f9186ae
Translated using Weblate (Russian)
t1011 Oct 15, 2017
da67a2c
Translated using Weblate (Chinese (Traditional))
s8321414 Oct 15, 2017
498ae90
Translated using Weblate (German)
krombel Oct 15, 2017
55b14d5
Translated using Weblate (Hungarian)
szimszon Oct 16, 2017
987072b
Translated using Weblate (German)
krombel Oct 19, 2017
7395d86
Translated using Weblate (German)
bamstam Oct 19, 2017
7369719
Translated using Weblate (Hungarian)
szimszon Oct 19, 2017
0e3fbb6
Merge branch 'develop' of https://github.com/vector-im/riot-web into …
Oct 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'develop' of https://github.com/vector-im/riot-web into … 
…develop

Conflicts:
	src/i18n/strings/de_DE.json
	src/i18n/strings/hu.json
	src/i18n/strings/ru.json
	src/i18n/strings/zh_Hant.json
Weblate committed Oct 20, 2017
commit 0e3fbb6770db9f3441c1cce31cb429173df10d5c

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.