Commit Graph

3629 Commits (b0486e333d66603aae06942857c09a8cd18492d4)

Author SHA1 Message Date
David Baker b0486e333d Chop off 'origin/'
when figuring out what branch we're on
2017-06-07 10:35:08 +01:00
RiotTranslate d235e2276f Translated using Weblate (Hungarian) (#4214)
Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/hu/
2017-06-06 23:23:29 +01:00
Matthew Hodgson 080cbea080 Merge pull request #4211 from uhoreg/compact
adjust alignment of message menu button in compact layout
2017-06-06 18:07:32 +01:00
David Baker 968e21a67d Merge branch 'master' into develop 2017-06-06 17:48:32 +01:00
David Baker 26bb962a3c v0.10.2 2017-06-06 17:45:07 +01:00
David Baker 88e159e462 Prepare changelog for v0.10.2 2017-06-06 17:45:06 +01:00
David Baker 951b63898b v0.10.2 2017-06-06 17:43:57 +01:00
David Baker 3d51156b7e Temporarily revert 2017-06-06 17:43:34 +01:00
David Baker d648dc867e v0.10.2 2017-06-06 17:41:57 +01:00
David Baker a62ed0eb03 reatc-sdk 0.9.2 2017-06-06 17:41:26 +01:00
Hubert Chathi 383f6b619b adjust alignment of message menu button 2017-06-06 12:11:02 -04:00
Matthew Hodgson 13c780c7c5 add traditional chinese, thai, greek 2017-06-06 16:51:00 +01:00
Matthew Hodgson dbbb916be8 Merge pull request #4207 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
2017-06-06 16:45:09 +01:00
RiotTranslate 8a6b940520 Merge remote-tracking branch 'origin/develop' into develop 2017-06-06 13:09:41 +00:00
Pitchaya Boonsarngsuk 5ad7099b6c Translated using Weblate (Thai)
Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
2017-06-06 13:07:22 +00:00
Max Sandholm 6518b9ac86 Translated using Weblate (Swedish)
Currently translated at 98.1% (159 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
2017-06-06 13:07:22 +00:00
Vladi 3843762123 Translated using Weblate (Russian)
Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/
2017-06-06 13:07:21 +00:00
Szimszon 82e1959f22 Translated using Weblate (Hungarian)
Currently translated at 87.0% (141 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/hu/
2017-06-06 13:07:20 +00:00
Kegsay 4cec4f066d Fix #4191: add defaults to avoid throwing (#4195) 2017-06-06 12:38:06 +01:00
David Baker ce01bcac2d Merge pull request #4197 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
2017-06-06 10:22:45 +01:00
Pitchaya Boonsarngsuk e8d5021b48 Translated using Weblate (Thai)
Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
2017-06-05 17:12:05 +00:00
RiotTranslate 95d9b85a93 Merge remote-tracking branch 'origin/develop' into develop 2017-06-05 15:09:47 +00:00
BrianMwit 2f990bf410 Translated using Weblate (Thai)
Currently translated at 56.7% (92 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
2017-06-05 15:09:47 +00:00
Matthew Hodgson c610d21e68 enable en_US as a 1st class language 2017-06-05 16:05:07 +01:00
Matthew Hodgson 58433423f4 Merge pull request #4193 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
2017-06-05 14:31:18 +01:00
BrianMwit e60b7c6dba Translated using Weblate (Thai)
Currently translated at 55.5% (90 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
2017-06-05 12:52:22 +00:00
BrianMwit 3b398cba6c Translated using Weblate (Thai)
Currently translated at 4.9% (8 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
2017-06-05 11:31:09 +00:00
BrianMwit 869d41e4b1 Added translation using Weblate (Thai) 2017-06-05 11:13:54 +00:00
Matthew Hodgson 7b9ae0157a Merge pull request #4183 from vector-im/t3chguy/electron_logo_windows_weirdness
to make the windows volume mixer not explode as it can't resize icons.
2017-06-04 22:58:17 +01:00
Matthew Hodgson 1bc30021c8 Merge pull request #4186 from vector-im/t3chguy/electron_devtools
provide react devtools in electron dev runs
2017-06-04 22:57:26 +01:00
RiotTranslate 9053e9846d Update from Weblate. (#4182)
* Translated using Weblate (Chinese (Traditional))

Currently translated at 61.1% (99 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/

* Translated using Weblate (German)

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 90.7% (147 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/

* Translated using Weblate (Swedish)

Currently translated at 43.8% (71 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/

* Translated using Weblate (Swedish)

Currently translated at 46.2% (75 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/

* Translated using Weblate (German)

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (Swedish)

Currently translated at 61.7% (100 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/

* Translated using Weblate (Swedish)

Currently translated at 72.2% (117 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/

* Translated using Weblate (Swedish)

Currently translated at 98.1% (159 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/

* Added translation using Weblate (Greek)

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/

* Translated using Weblate (Dutch)

Currently translated at 75.9% (123 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/nl/

* Translated using Weblate (Greek)

Currently translated at 91.9% (149 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/el/

* Translated using Weblate (Polish)

Currently translated at 20.3% (33 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/

* Translated using Weblate (Russian)

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/

* Translated using Weblate (Portuguese)

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pt/

* [WEBLATE] fix merge fail

* Translated using Weblate (Greek)

Currently translated at 96.9% (157 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/el/

* Translated using Weblate (German)

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (Greek)

Currently translated at 96.9% (157 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/el/

* Translated using Weblate (Polish)

Currently translated at 23.4% (38 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/

* Translated using Weblate (Polish)

Currently translated at 24.6% (40 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/

* Translated using Weblate (Polish)

Currently translated at 30.8% (50 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/

* Translated using Weblate (Polish)

Currently translated at 42.5% (69 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/

* Translated using Weblate (Polish)

Currently translated at 43.8% (71 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/

* Translated using Weblate (Polish)

Currently translated at 46.9% (76 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/

* Added translation using Weblate (English (United States))

* Translated using Weblate (English (United States))

Currently translated at 21.6% (35 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/

* Translated using Weblate (English (United States))

Currently translated at 25.3% (41 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/

* Translated using Weblate (English (United States))

Currently translated at 40.1% (65 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/

* Translated using Weblate (English (United States))

Currently translated at 55.5% (90 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/

* Translated using Weblate (English (United States))

Currently translated at 69.1% (112 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/

* Translated using Weblate (English (United States))

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/

* Translated using Weblate (German)

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
2017-06-04 22:55:34 +01:00
Matthew Hodgson 8cd4bf5342 Merge pull request #4184 from MTRNord/patch-1
Fix DeprecationWarning
2017-06-04 22:55:12 +01:00
Michael Telatynski f24c6de245
provide react devtools in electron dev builds
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-04 15:30:44 +01:00
Michael Telatynski 1e5a742602 this actually fixes things, still not happy with it, introduces more delay
(not noticeably more than the existing delay)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-04 14:27:19 +01:00
Marcel 4225813523 Fix DeprecationWarning
the copy-res.js did throw "(node:8688) DeprecationWarning: Calling an asynchronous function without callback is deprecated." before
2017-06-04 12:36:14 +02:00
Michael Telatynski 25a0af6ddb to make the windows volume mixer not explode as it can't resize icons.
I hate Windows.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-04 11:05:28 +01:00
RiotTranslate 7c13e2d0ab Update from Weblate. (#4177)
* Translated using Weblate (Chinese (Traditional))

Currently translated at 61.1% (99 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/

* Translated using Weblate (German)

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 90.7% (147 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/

* Translated using Weblate (Swedish)

Currently translated at 43.8% (71 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/

* Translated using Weblate (Swedish)

Currently translated at 46.2% (75 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/

* Translated using Weblate (German)

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (Swedish)

Currently translated at 61.7% (100 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/

* Translated using Weblate (Swedish)

Currently translated at 72.2% (117 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/

* Translated using Weblate (Swedish)

Currently translated at 98.1% (159 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/

* Added translation using Weblate (Greek)

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/

* Translated using Weblate (Dutch)

Currently translated at 75.9% (123 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/nl/

* Translated using Weblate (Greek)

Currently translated at 91.9% (149 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/el/

* Translated using Weblate (Polish)

Currently translated at 20.3% (33 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/

* Translated using Weblate (Russian)

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/

* Translated using Weblate (Portuguese)

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pt/

* [WEBLATE] fix merge fail

* Translated using Weblate (Greek)

Currently translated at 96.9% (157 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/el/

* Translated using Weblate (German)

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (Greek)

Currently translated at 96.9% (157 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/el/

* Translated using Weblate (Polish)

Currently translated at 23.4% (38 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/

* Translated using Weblate (Polish)

Currently translated at 24.6% (40 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/

* Translated using Weblate (Polish)

Currently translated at 30.8% (50 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/

* Translated using Weblate (Polish)

Currently translated at 42.5% (69 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/

* Translated using Weblate (Polish)

Currently translated at 43.8% (71 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/

* Translated using Weblate (Polish)

Currently translated at 46.9% (76 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/

* Added translation using Weblate (English (United States))

* Translated using Weblate (English (United States))

Currently translated at 21.6% (35 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/

* Translated using Weblate (English (United States))

Currently translated at 25.3% (41 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/

* Translated using Weblate (English (United States))

Currently translated at 40.1% (65 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/

* Translated using Weblate (English (United States))

Currently translated at 55.5% (90 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/

* Translated using Weblate (English (United States))

Currently translated at 69.1% (112 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/

* Translated using Weblate (English (United States))

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/
2017-06-04 09:52:02 +01:00
Matthew Hodgson 0d7aefb7c1 Merge pull request #4178 from vector-im/t3chguy/patch-4
room link should be a matrix.to one
2017-06-03 22:33:57 +01:00
Michael Telatynski e7fc602b3d room link should be a matrix.to one 2017-06-03 21:54:45 +01:00
Matthew Hodgson ed6709ec6c rename WMClass as riot rather than confusing riot-web 2017-06-03 18:43:06 +01:00
Matthew Hodgson 31138ca573 fix toAction i18n thinkos 2017-06-03 12:49:37 +01:00
RiotTranslate 2adecce3f2 Update from Weblate. (#4175)
* Translated using Weblate (Chinese (Traditional))

Currently translated at 61.1% (99 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/

* Translated using Weblate (German)

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 90.7% (147 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/

* Translated using Weblate (Swedish)

Currently translated at 43.8% (71 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/

* Translated using Weblate (Swedish)

Currently translated at 46.2% (75 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/

* Translated using Weblate (German)

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (Swedish)

Currently translated at 61.7% (100 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/

* Translated using Weblate (Swedish)

Currently translated at 72.2% (117 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/

* Translated using Weblate (Swedish)

Currently translated at 98.1% (159 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/

* Added translation using Weblate (Greek)

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/

* Translated using Weblate (Dutch)

Currently translated at 75.9% (123 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/nl/

* Translated using Weblate (Greek)

Currently translated at 91.9% (149 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/el/

* Translated using Weblate (Polish)

Currently translated at 20.3% (33 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/

* Translated using Weblate (Russian)

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/

* Translated using Weblate (Portuguese)

Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pt/

* [WEBLATE] fix merge fail

* Translated using Weblate (Greek)

Currently translated at 96.9% (157 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/el/
2017-06-03 12:45:09 +01:00
Matthew Hodgson 85782f736c Merge branch 'master' into develop 2017-06-02 22:52:28 +01:00
Matthew Hodgson ec71903b6e Merge branch 'develop' of git+ssh://github.com/vector-im/riot-web into develop 2017-06-02 22:51:39 +01:00
Michael Telatynski 5fb60406b0 add minimum electron version requirement 2017-06-02 22:49:04 +01:00
Matthew Hodgson 5add4a1b95 v0.10.1 2017-06-02 22:48:18 +01:00
Matthew Hodgson 7b7482f21f Prepare changelog for v0.10.1 2017-06-02 22:48:17 +01:00
Matthew Hodgson a4526097ce v0.10.1 2017-06-02 22:46:25 +01:00
Matthew Hodgson dea012f460 bump to 0.9.1 2017-06-02 22:45:59 +01:00
Matthew Hodgson 49e9d58418 oops, expand the dropdown a bit if possible 2017-06-02 22:10:29 +01:00