From d3f94a4847b03e401b3ef94ecccf29d6d62d6e9f Mon Sep 17 00:00:00 2001
From: Kyf Lee <coughingmouse@pm.me>
Date: Thu, 26 Jul 2018 03:13:34 +0000
Subject: [PATCH 01/31] Translated using Weblate (Korean)

Currently translated at 94.5% (35 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/
---
 src/i18n/strings/ko.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index e03b2013..b976664c 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -1,7 +1,7 @@
 {
     "Custom Server Options": "사용자 지정 서버 설정",
     "Dismiss": "없애기",
-    "powered by Matrix": "Matrix의 지원을 받고 있어요",
+    "powered by Matrix": "Matrix의 지원을 받고 있습니다",
     "Riot Desktop on %(platformName)s": "%(platformName)s PC용 Riot",
     "Riot is not supported on mobile web. Install the app?": "”Riot은 모바일 사이트를 지원하지 않습니다. 앱을 설치하시겠어요?",
     "Unknown device": "알 수 없는 장치",

From b05a8b6dd3c46d4a127ebf91ee3c621535e41983 Mon Sep 17 00:00:00 2001
From: pebles <pebles@sindominio.net>
Date: Sat, 20 Jan 2018 16:07:45 +0000
Subject: [PATCH 02/31] Translated using Weblate (Spanish)

Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
---
 src/i18n/strings/es.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index bf3cfced..921b4566 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -34,5 +34,6 @@
     "Dev chat for the Riot/Web dev team": "Conversaciones del equipo de desarrollo de Riot/Web",
     "Dev chat for the Dendrite dev team": "Conversaciones del equipo de desarrollo de Dendrite",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Muchas salas ya están disponibles en Matrix, enlazadas a redes existentes (Slack, IRC, Gitter, etc) o independientes. ¡Revisa el directorio!",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Puedes usar las opciones del servidor personalizado para acceder a otros servidores Matrix especificando su URL. <br/> Esto te permite usar Riot con una cuenta Matrix existente en un servidor doméstico distinto. <br/><br/>También puedes establecer un servidor de identidad personalizado pero no podrás invitar a otros usuarios usando su dirección de correo electrónico, y tampoco ser invitado por el tuyo."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Puedes usar las opciones del servidor personalizado para acceder a otros servidores Matrix especificando su URL. <br/> Esto te permite usar Riot con una cuenta Matrix existente en un servidor doméstico distinto. <br/><br/>También puedes establecer un servidor de identidad personalizado pero no podrás invitar a otros usuarios usando su dirección de correo electrónico, y tampoco ser invitado por el tuyo.",
+    "Co-ordination for Riot translators": "Co-odinación de traductores de Riot"
 }

From 8a18488b1e3aece694fecdbc6255b68148f54730 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 2 Aug 2018 11:00:35 +0100
Subject: [PATCH 03/31] Pin sanitize-html to 0.18.2

Because 0.18.3 is broken (https://github.com/punkave/sanitize-html/issues/241
 / https://github.com/punkave/sanitize-html/issues/242
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6c635bff..5506fe85 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "prop-types": "^15.5.10",
     "react": "^15.6.0",
     "react-dom": "^15.6.0",
-    "sanitize-html": "^1.11.1",
+    "sanitize-html": "1.18.2",
     "ua-parser-js": "^0.7.10",
     "url": "^0.11.0"
   },

From ad9f786646ab4c156de788f6eb30e9c8cdbcf311 Mon Sep 17 00:00:00 2001
From: kR <krkkx@protonmail.com>
Date: Wed, 1 Aug 2018 08:52:39 +0000
Subject: [PATCH 04/31] Translated using Weblate (Polish)

Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
---
 src/i18n/strings/pl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 47c0c7a6..949538e1 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -30,7 +30,7 @@
     "Implementing VoIP services with Matrix": "Implementowanie usług telefonii internetowej VoIP w oparciu o Matrix",
     "Discussion of the Identity Service API": "Dyskusja na temat API Identity Service",
     "Support for those using, running and writing other bridges": "Wsparcie dla używających, zapewniających i piszących inne mosty",
-    "Contributing code to Matrix and Riot": "Wspieranie rozwoju Matrix i Riot",
+    "Contributing code to Matrix and Riot": "Współtworzenie kodu do Matrix lub Riot",
     "Dev chat for the Riot/Web dev team": "Czat deweloperów zespołu Riot/Web",
     "Dev chat for the Dendrite dev team": "Czat deweloperów zespołu Dendrite",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix ma wiele, już działających pokoi, połączonych z istniejącymi sieciami, takimi jak Slack, IRC lub Gitter, a także wiele zupełnie niezależnych. Możesz przejrzeć je wszystkie w spisie pokoi!",

From a79e9b4fd61247bb9960748b62d366466ac94440 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 2 Aug 2018 16:22:07 +0100
Subject: [PATCH 05/31] Unpin sanitize-html

1.18.4 is now out which makes it work with webpack again
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5506fe85..7414938d 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "prop-types": "^15.5.10",
     "react": "^15.6.0",
     "react-dom": "^15.6.0",
-    "sanitize-html": "1.18.2",
+    "sanitize-html": "^1.18.4",
     "ua-parser-js": "^0.7.10",
     "url": "^0.11.0"
   },

From 65e690bad71cf93c68207d5119afadb96e447778 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 3 Aug 2018 15:02:25 +0100
Subject: [PATCH 06/31] CSS for user limit error

See https://github.com/matrix-org/matrix-react-sdk/pull/2108
---
 res/themes/status/css/_status.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/themes/status/css/_status.scss b/res/themes/status/css/_status.scss
index 7e97bb48..5b5a264d 100644
--- a/res/themes/status/css/_status.scss
+++ b/res/themes/status/css/_status.scss
@@ -76,6 +76,7 @@ $focus-brightness: 125%;
 
 // red warning colour
 $warning-color: #F69E98;
+$warning-bg-color: #DF2A8B;
 $mention-user-pill-bg-color: #ff0064;
 $other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
 

From 3a3f3f664a99460a155311d91c8e54b3fa5dbe68 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 7 Aug 2018 17:05:17 +0100
Subject: [PATCH 07/31] CSS for MAU warning bar

---
 res/themes/status/css/_status.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/themes/status/css/_status.scss b/res/themes/status/css/_status.scss
index 5b5a264d..c99af14e 100644
--- a/res/themes/status/css/_status.scss
+++ b/res/themes/status/css/_status.scss
@@ -77,6 +77,7 @@ $focus-brightness: 125%;
 // red warning colour
 $warning-color: #F69E98;
 $warning-bg-color: #DF2A8B;
+$info-bg-color: #2A9EDF;
 $mention-user-pill-bg-color: #ff0064;
 $other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
 

From 30d7ee892ee0a3c8ffff3497fec60dc66651bf38 Mon Sep 17 00:00:00 2001
From: csybr <spirefan@live.no>
Date: Sat, 11 Aug 2018 16:47:25 +0000
Subject: [PATCH 08/31] Added translation using Weblate (Norwegian Nynorsk)

---
 src/i18n/strings/nn.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/i18n/strings/nn.json

diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/src/i18n/strings/nn.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From 789ec0baeff6eb76b1621988b66dbaed3c54ca96 Mon Sep 17 00:00:00 2001
From: csybr <spirefan@live.no>
Date: Sun, 12 Aug 2018 18:24:37 +0000
Subject: [PATCH 09/31] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nn/
---
 src/i18n/strings/nn.json | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index 9e26dfee..3fa75448 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -1 +1,39 @@
-{}
\ No newline at end of file
+{
+    "Riot is not supported on mobile web. Install the app?": "Riot er ikkja støtta på mobilnettlesare. Last æppen inn?",
+    "Riot Desktop on %(platformName)s": "Riot på Skrivebord for %(platformName)s",
+    "Unknown device": "Ukjend eining",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s gjennom %(browserName)s på %(osName)s",
+    "You need to be using HTTPS to place a screen-sharing call.": "Du må bruka HTTPS for å ha ei samtale med skjermdeling.",
+    "Dismiss": "Avvis",
+    "powered by Matrix": "Matrixdriven",
+    "Welcome to Riot.im": "Velkomen til Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Desentralisert, enkryptert nettprat &amp; samarbeid driven av [matrix]",
+    "Search the room directory": "Søk i romutvalet",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Det finst allereie massevis av rom på Matrix, anten lenkja til nettverk som allereie finst (Slack, IRC, Gitter osv.) eller uavhengige. Tak ein titt på utvalet!",
+    "Chat with Riot Bot": "Nettprat med Riot Bot",
+    "Get started with some tips from Riot Bot!": "Kom i gang med nokre råd frå Riot Bot!",
+    "General discussion about Matrix and Riot": "Allmenn meiningsutveksling om Matrix og Riot",
+    "Discussion of all things Matrix!": "Meiningsutveksling om alt som gjeld Matrix!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Skrivebordsprat",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk-prat",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk-prat",
+    "Matrix technical discussions": "Teknisk meiningsutveksling om Matrix",
+    "Running Matrix services": "Å køyra Matrix-tenestar",
+    "Community-run support for Synapse": "Samfunnsdriven støtte for Synapse",
+    "Admin support for Dendrite": "Administratorstøtte for Dendrite",
+    "Announcements about Synapse releases": "Kunngjeringar om Synapse-utgåver",
+    "Support for those using and running matrix-appservice-irc": "Støtte for dei som brukar og køyrar matrix-appleservice-irc",
+    "Building services on Matrix": "Byggingstenester på Matrix",
+    "Support for those using the Matrix spec": "Støtte for dei som brukar Matrix-specen",
+    "Design and implementation of E2E in Matrix": "E2E-oppbygging og -implementering på Matrix",
+    "Implementing VR services with Matrix": "Implementering av VR-tenester med Matrix",
+    "Implementing VoIP services with Matrix": "Implementering av VoIP-tenester med Matrix",
+    "Discussion of the Identity Service API": "Meiningsutveksling om Identitetstenar-APIen",
+    "Support for those using, running and writing other bridges": "Støtte for dei som brukar, køyrer og skriv andre bridger",
+    "Contributing code to Matrix and Riot": "Å bidraga med kode til Matrix og Riot",
+    "Dev chat for the Riot/Web dev team": "Utviklar-prat for Riot/Web-utviklargruppa",
+    "Dev chat for the Dendrite dev team": "Utviklar-prat for Dendrite-utviklargruppa",
+    "Co-ordination for Riot translators": "Samordning for Riot-omsetjare",
+    "Custom Server Options": "Eigentenar-innstillingar",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Du kan bruka eigentenarinnstillingar til å logga inn på andre Matrixtenarar ved å oppgje ein annan Heimtenar-URL. <br/>Dette gjer at du kan bruka Riot med ein Matrixbrukar som allereie finst på ein annan heimtenar.<br/><br/>Du kan òg setja ein eigen identitetstenar men du kjem i so fall ikkje til å kunna byda brukare inn med email, eller å sjølv verta boden inn med email."
+}

From 1d50eb0d7f31cd7f1a3a62de8ee20a41d1780097 Mon Sep 17 00:00:00 2001
From: Moo <hazap@hotmail.com>
Date: Sun, 12 Aug 2018 21:07:43 +0000
Subject: [PATCH 10/31] Translated using Weblate (Lithuanian)

Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lt/
---
 src/i18n/strings/lt.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index f3d6340d..abd733cd 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -1,6 +1,6 @@
 {
     "Unknown device": "Nežinomas įrenginys",
-    "powered by Matrix": "palaikomas Matrix",
+    "powered by Matrix": "veikia su Matrix",
     "Welcome to Riot.im": "Sveiki atvykę į Riot.im",
     "Chat with Riot Bot": "Kalbėtis su Riot robotu",
     "General discussion about Matrix and Riot": "Bendros diskusijos apie Matrix ir Riot",
@@ -34,5 +34,6 @@
     "Support for those using, running and writing other bridges": "Palaikymas skirtas tiems kas naudoja kitus tiltus",
     "Contributing code to Matrix and Riot": "Contributing code to Matrix and Riot",
     "Dev chat for the Riot/Web dev team": "Kūrėjų čatas Riot/Web dev team",
-    "Dev chat for the Dendrite dev team": "Kūrėjų čatas Dendrite dev team"
+    "Dev chat for the Dendrite dev team": "Kūrėjų čatas Dendrite dev team",
+    "Co-ordination for Riot translators": "Koordinavimas Riot vertėjams"
 }

From 5df085848b65f18e7e83f0ae50aa7f7feb318f73 Mon Sep 17 00:00:00 2001
From: ButterflyOfFire <ButterflyOfFire@protonmail.com>
Date: Tue, 7 Aug 2018 11:36:52 +0000
Subject: [PATCH 11/31] Translated using Weblate (Arabic)

Currently translated at 16.2% (6 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ar/
---
 src/i18n/strings/ar.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index 7815dce3..1aa4c70e 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -3,5 +3,6 @@
     "Dismiss": "تجاهل",
     "Riot is not supported on mobile web. Install the app?": "رايوت غير مدعوم في وضعية الويب على الهاتف. هل تريد تثبيت التطبيق ؟",
     "Riot Desktop on %(platformName)s": "الواجهة المكتبية لرايوت على %(platformName)s",
-    "Unknown device": "جهاز مجهول"
+    "Unknown device": "جهاز مجهول",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s عبر %(browserName)s على %(osName)s"
 }

From f31f16cd0d162f84e237a17d31a155c5ca085444 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 10 Aug 2018 08:25:32 +0000
Subject: [PATCH 12/31] Translated using Weblate (Hungarian)

Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
---
 src/i18n/strings/hu.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 31591e34..ad20927e 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -34,6 +34,6 @@
     "Dev chat for the Riot/Web dev team": "Csevegés a Riot/Web fejlesztői csapatával fejlesztőknek",
     "Dev chat for the Dendrite dev team": "Csevegés a Dendrite fejlesztői csapatával fejlesztőknek",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Már sok szoba van a Matrixon: más hálózatokkal (Slack, IRC, Gitter stb.) összekapcsolt és függetlenek szobák is. Nézd meg a szobajegyzéket!",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Bejelentkezhetsz más Matrix szerverre is az egyedi szerverbeállításoknál megadott másik szerver URL-jével.<br/>Így használhatod a Riotot egy már máshol meglévő Matrix fiókkal is.<br/><br/>Beállíthatsz egyéni identitásszervert is, de akkor nem tudsz más felhasználókat e-mail címmel meghívni, illetve ők sem tudnak téged.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Bejelentkezhetsz más Matrix szerverre is az egyedi szerverbeállításoknál megadott Matrix szerver URL-jével.<br/>Így használhatod a Riotot egy már máshol meglévő Matrix fiókkal is.<br/><br/>Beállíthatsz egyéni identitásszervert is, de akkor nem tudsz más felhasználókat e-mail címmel meghívni, illetve ők sem tudnak téged.",
     "Co-ordination for Riot translators": "Koordináció Riot fordítók számára"
 }

From 95018efa52f3632c378ccc82ea4f1037a8f256de Mon Sep 17 00:00:00 2001
From: Moo <hazap@hotmail.com>
Date: Sun, 12 Aug 2018 21:36:58 +0000
Subject: [PATCH 13/31] Translated using Weblate (Lithuanian)

Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lt/
---
 src/i18n/strings/lt.json | 52 ++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index abd733cd..3129dcb9 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -6,34 +6,34 @@
     "General discussion about Matrix and Riot": "Bendros diskusijos apie Matrix ir Riot",
     "Matrix technical discussions": "Matrix techninės diskusijos",
     "Riot is not supported on mobile web. Install the app?": "Riot nėra palaikoma naršant svetainėje mobiliaisiais įrenginiais. Įdiegti programėlę?",
-    "Riot Desktop on %(platformName)s": "Riot Desktop, %(platformName)s",
+    "Riot Desktop on %(platformName)s": "Riot Desktop, naudojant %(platformName)s",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s per %(browserName)s, naudojant %(osName)s",
     "You need to be using HTTPS to place a screen-sharing call.": "Norint skambinti su ekrano bendrinimo funkcija būtina naudoti HTTPS.",
-    "Custom Server Options": "Pasirinktiniai serverio nustatymai",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Norėdami jungtis prie kito nei Matrix serverio galite pasirinktinio serverio nustatymuose nurodyti kito serverio URL adresą.<br/>Ši funkcija leis naudoti Riot su esama Matrix serverio paskyrą kituose serveriuose.<br/><br/>Taip pat galite nurodyti pasirinktinį identifikavimo serverį, bet tuomet negalėsite kviesti kitų vartotojų el. paštu ar jie jūsų.",
-    "Dismiss": "Nutraukti",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralizuotas, šifruotas čatas; bendradarbiavimas palaikomas [matrix]",
+    "Custom Server Options": "Tinkinto serverio parametrai",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Norėdami prisijungti prie kito nei Matrix serverio, galite naudoti tinkinto serverio parametrus ir nurodyti kito serverio URL adresą.<br/>Tai leis jums naudoti Riot su esama Matrix paskyra kituose serveriuose.<br/><br/>Taip pat galite nustatyti tinkintą tapatybės serverį, tačiau tuomet negalėsite pakviesti kitus naudotojus pagal el. paštą, o taip pat ir jie negalės pakviesti jūsų.",
+    "Dismiss": "Atmesti",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralizuoti, šifruoti pokalbiai ir bendradarbiavimas, veikiantis su [matrix]",
     "Search the room directory": "Ieškoti kambarių kataloge",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Daugybė kambarių yra prisijungę prie Matrix, kurie yra susieti su egzistuojančiais tinklais (Slack, IRC, Gitter etc) arba nepriklausomi. Patikrinkite kambarių katalogą!",
-    "Get started with some tips from Riot Bot!": "Pradėkite su patarimais nuo Riot roboto!",
-    "Discussion of all things Matrix!": "Diskusijos apie viską Matrix!",
-    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Darbalaukio čatas",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat",
-    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk chat",
-    "Running Matrix services": "Vykdant Matrix servisus",
-    "Community-run support for Synapse": "Bendruomenės Synapse palaikymas",
-    "Admin support for Dendrite": "Administratoriaus Dendrite palaikymas",
-    "Announcements about Synapse releases": "Pranešimai apie Synapse naujinimus",
-    "Support for those using and running matrix-appservice-irc": "Palaikymas skirtas matrix-appservice-irc naudotojams",
-    "Building services on Matrix": "Servisų kūrimas ant Matrix",
-    "Support for those using the Matrix spec": "Palaikymas skirtas Matrix spec",
-    "Design and implementation of E2E in Matrix": "E2E dizainas ir įgyvendinimas Matrix'e",
-    "Implementing VR services with Matrix": "VR serviso įgyvendinimas su Matrix",
-    "Implementing VoIP services with Matrix": "VoIP serviso įgyvendinimas su Matrix",
-    "Discussion of the Identity Service API": "Diskusijos apie identifikavimo serviso API",
-    "Support for those using, running and writing other bridges": "Palaikymas skirtas tiems kas naudoja kitus tiltus",
-    "Contributing code to Matrix and Riot": "Contributing code to Matrix and Riot",
-    "Dev chat for the Riot/Web dev team": "Kūrėjų čatas Riot/Web dev team",
-    "Dev chat for the Dendrite dev team": "Kūrėjų čatas Dendrite dev team",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Daugybė kambarių jau yra Matrix, susieti prie esamų tinklų (Slack, IRC, Gitter ir t.t.) arba nepriklausomi. Pasižvalgykite kataloge!",
+    "Get started with some tips from Riot Bot!": "Pradėkite darbo pradžią nuo Riot roboto patarimų!",
+    "Discussion of all things Matrix!": "Diskusijos apie viską, kas susiję su Matrix!",
+    "Riot/Web &amp; Desktop chat": "Pokalbiai apie Riot/Web ir Desktop",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Pokalbiai apie Riot/iOS ir matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Pokalbiai apie Riot/Android ir matrix-android-sdk",
+    "Running Matrix services": "Matrix paslaugų paleidimas",
+    "Community-run support for Synapse": "Su Synapse susijęs bendruomenės palaikymas",
+    "Admin support for Dendrite": "Dendrite administratorių palaikymas",
+    "Announcements about Synapse releases": "Skelbimai apie Synapse laidas",
+    "Support for those using and running matrix-appservice-irc": "Palaikymas skirtas besinaudojantiems ir prižiūrintiems matrix-appservice-irc",
+    "Building services on Matrix": "Paslaugų kūrimas, naudojant Matrix",
+    "Support for those using the Matrix spec": "Palaikymas skirtas besinaudojantiems Matrix specifikacija",
+    "Design and implementation of E2E in Matrix": "E2E dizainas ir įgyvendinimas ties Matrix",
+    "Implementing VR services with Matrix": "VR paslaugų įgyvendinimas ties Matrix",
+    "Implementing VoIP services with Matrix": "VoIP paslaugų įgyvendinimas ties Matrix",
+    "Discussion of the Identity Service API": "Diskusijos apie tapatybės paslaugos API",
+    "Support for those using, running and writing other bridges": "Palaikymas skirtas besinaudojantiems, prižiūrintiems ar kuriantiems kitus tinklų tiltus",
+    "Contributing code to Matrix and Riot": "Matrix ir Riot kodo plėtojimas",
+    "Dev chat for the Riot/Web dev team": "Kūrėjų pokalbiai, skirti Riot/Web kūrėjų komandai",
+    "Dev chat for the Dendrite dev team": "Kūrėjų pokalbiai, skirti Dendrite kūrėjų komandai",
     "Co-ordination for Riot translators": "Koordinavimas Riot vertėjams"
 }

From 2a4b322ec1b202c42413505ccbb7d25651e95f1b Mon Sep 17 00:00:00 2001
From: csybr <spirefan@live.no>
Date: Sun, 12 Aug 2018 19:46:28 +0000
Subject: [PATCH 14/31] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nn/
---
 src/i18n/strings/nn.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index 3fa75448..11ed77ba 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -29,7 +29,7 @@
     "Implementing VR services with Matrix": "Implementering av VR-tenester med Matrix",
     "Implementing VoIP services with Matrix": "Implementering av VoIP-tenester med Matrix",
     "Discussion of the Identity Service API": "Meiningsutveksling om Identitetstenar-APIen",
-    "Support for those using, running and writing other bridges": "Støtte for dei som brukar, køyrer og skriv andre bridger",
+    "Support for those using, running and writing other bridges": "Støtte for dei som brukar, køyrer og skriv andre bruer",
     "Contributing code to Matrix and Riot": "Å bidraga med kode til Matrix og Riot",
     "Dev chat for the Riot/Web dev team": "Utviklar-prat for Riot/Web-utviklargruppa",
     "Dev chat for the Dendrite dev team": "Utviklar-prat for Dendrite-utviklargruppa",

From fce68e491ab0c129ed03ba4e4ad0a0cbe275f9bd Mon Sep 17 00:00:00 2001
From: maraf24 <mariusz24@gmail.com>
Date: Fri, 3 Aug 2018 19:47:52 +0000
Subject: [PATCH 15/31] Translated using Weblate (Polish)

Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
---
 src/i18n/strings/pl.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 949538e1..b182eeb8 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -8,12 +8,12 @@
     "Unknown device": "Nieznane urządzenie",
     "You need to be using HTTPS to place a screen-sharing call.": "Musisz używać bezpiecznego protokołu HTTPS aby użyć połączenia współdzielenia ekranu.",
     "Welcome to Riot.im": "Witamy w Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Zdecentralizowany, szyfrowany czat &amp; współpraca wspierana przez [matrix]",
-    "Search the room directory": "Wyszukaj katalog pokojów",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Zdecentralizowany, szyfrowany czat &amp; współpraca oparta na [matrix]",
+    "Search the room directory": "Przeszukaj katalog pokojów",
     "Chat with Riot Bot": "Rozmowa z Botem Riota",
     "Get started with some tips from Riot Bot!": "Rozpocznij z wskazówkami Riot Bota!",
-    "General discussion about Matrix and Riot": "Generalna rozmowa o Matrix i Riot",
-    "Discussion of all things Matrix!": "Rozmowa o wszystkim Matrixowym!",
+    "General discussion about Matrix and Riot": "Ogólna rozmowa o Matrix i Riot",
+    "Discussion of all things Matrix!": "Rozmowa o wszystkich sprawach Matrixowych!",
     "Matrix technical discussions": "Dyskusje techniczne Matrixa",
     "Riot/Web &amp; Desktop chat": "Czat o Riot/Web i Desktop",
     "Riot/iOS &amp; matrix-ios-sdk chat": "Czat o Riot/iOS i matrix-ios-sdk",
@@ -29,7 +29,7 @@
     "Implementing VR services with Matrix": "Implementowanie usług wirtualnej rzeczywistości w oparciu o Matrix",
     "Implementing VoIP services with Matrix": "Implementowanie usług telefonii internetowej VoIP w oparciu o Matrix",
     "Discussion of the Identity Service API": "Dyskusja na temat API Identity Service",
-    "Support for those using, running and writing other bridges": "Wsparcie dla używających, zapewniających i piszących inne mosty",
+    "Support for those using, running and writing other bridges": "Wsparcie dla używających, utrzymujących i piszących inne mosty",
     "Contributing code to Matrix and Riot": "Współtworzenie kodu do Matrix lub Riot",
     "Dev chat for the Riot/Web dev team": "Czat deweloperów zespołu Riot/Web",
     "Dev chat for the Dendrite dev team": "Czat deweloperów zespołu Dendrite",

From 2e1392ccf858af83fd95ef952807b23c8c67dd3c Mon Sep 17 00:00:00 2001
From: Mary Ghelaghutashvili <bluenutterfly@zusmail.xyz>
Date: Tue, 14 Aug 2018 06:51:27 +0000
Subject: [PATCH 16/31] Added translation using Weblate (Georgian)

---
 src/i18n/strings/ka.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/i18n/strings/ka.json

diff --git a/src/i18n/strings/ka.json b/src/i18n/strings/ka.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/src/i18n/strings/ka.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From 1d00254d6c941d8839f3a6276db7b7b7bd0b94e0 Mon Sep 17 00:00:00 2001
From: Mary Ghelaghutashvili <bluenutterfly@zusmail.xyz>
Date: Tue, 14 Aug 2018 08:24:19 +0000
Subject: [PATCH 17/31] Translated using Weblate (Georgian)

Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ka/
---
 src/i18n/strings/ka.json | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ka.json b/src/i18n/strings/ka.json
index 9e26dfee..76e22da6 100644
--- a/src/i18n/strings/ka.json
+++ b/src/i18n/strings/ka.json
@@ -1 +1,39 @@
-{}
\ No newline at end of file
+{
+    "Riot is not supported on mobile web. Install the app?": "Riot ვებსაიტს არ აქვს მხარდაჭერა მობილური მოწყობილობებისთვის. გსურთ აპლიკაციის დაყენება?",
+    "Riot Desktop on %(platformName)s": "Riot Desktop-ი %(platformName)s-ზე",
+    "Unknown device": "უცნობი მოწყობილობა",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s-ი %(browserName)s-ით %(osName)s-იდან",
+    "You need to be using HTTPS to place a screen-sharing call.": "ეკრანის გაზიარების ფუნქციის მქონე ზარისთვის საჭიროა, იყენებდეთ HTTPS-ს.",
+    "Custom Server Options": "პერსონალიზებული სერვერის პარამეტრები",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "სხვა Matrix სერვერებზე შესასვლელად შეგიძლიათ გამოიყენოთ პერსონალიზებული სერვერის პარამეტრები განსხვავებული მთავარი სერვერის URL-ის მითითებით <br/>ეს გაძლევთ საშუალებას, გამოიყენოთ Riot-ი არსებულ Matrix ანგარიშით სხვა მთავარ სერვერზე.<br/><br/>თქვენ ასევე შეგიძლიათ დააყენოთ პერსონალიზებული იდენტუროის სერვერი, მაგრამ თქვენ ვერ მოიწვევთ მომხმარებლებს ელფოსტის მისამართით და თავად თქვენ ვერ მოგიწვევენ ელფოსტის მისამართით.",
+    "Dismiss": "უარის თქმა",
+    "powered by Matrix": "Matrix-ზე დაფუძნებული",
+    "Welcome to Riot.im": "კეთილი იყოს თქვენი მობრძანება Riot.im-ზე",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "დეცენტრალიზებული, დაშიფრული ჩატი &amp; კოლაბორაცია, დაფუძნებული [matrix]-ზე",
+    "Search the room directory": "მოძებნა ოთახის სიაში",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "მრავალი ოთახი უკვე არსებობს Matrix-ში, რომლებიც არიან დაკავშირებული არსებულ ქსელებთან (Slack, IRC, Glitter და ა.შ) ან დამოუკიდებელი. შეამოწმეთ სია!",
+    "Chat with Riot Bot": "ისაუბრეთ Riot-ის Bot-თან",
+    "Get started with some tips from Riot Bot!": "დაიწყეთ რჩევებით Riot-ის Bot-ისგან!",
+    "General discussion about Matrix and Riot": "ზოგადი დისკუსია Matrix-სა და Riot-ზე",
+    "Discussion of all things Matrix!": "დისკუსია ყველაფერზე, რაც ეხება Matrix-ს!",
+    "Riot/Web &amp; Desktop chat": "Riot/ვებ-ისა &amp; Desktop-ის ჩატი",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS-ისა &amp; matrix-ios-sdk-ის ჩატი",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/ანდროიდისა &amp; matrix-android-sdk-ის ჩატი",
+    "Matrix technical discussions": "Matrix-ის ტექნიკური დისკუსიები",
+    "Running Matrix services": "Matrix-ის სერვისების გამოყენება",
+    "Community-run support for Synapse": "საზოგადოებისმიერი მხარდაჭერა Synapse-ისთვის",
+    "Admin support for Dendrite": "ადმინისტრატორის მხარდაჭერა Dendrite-ისთვის",
+    "Announcements about Synapse releases": "განცხადებები Synapse-ის გამოშვებებთან დაკავშირებით",
+    "Support for those using and running matrix-appservice-irc": "მხარდაჭერა მათთვის, ვინც იყენებს matrix-appservice-irc-ს",
+    "Building services on Matrix": "სერვისების Matrix-ზე დაფუძნებით გამომუშავება",
+    "Support for those using the Matrix spec": "მხარდაჭერა Matrix სპეციფიკაციების გამოყენებასთან დაკავშირებულ კითხვებზე",
+    "Design and implementation of E2E in Matrix": "პირით-პირამდე დაშიფვრის დაგეგმვა და შესრულება",
+    "Implementing VR services with Matrix": "VR სერვისების Matrix-ით შესრულება",
+    "Implementing VoIP services with Matrix": "VoIP სერვისების Matrix-ით შესრულება",
+    "Discussion of the Identity Service API": "იდენტიფიკაციის სერვისის API-ს დისკუსია",
+    "Support for those using, running and writing other bridges": "მხარდაჭერა მათთვის, ვინც იყენებს და წერს სხვა ხიდებს",
+    "Contributing code to Matrix and Riot": "Matrix-ის და Riot-ის გამომუშავებაში მონაწილეობის მიღება",
+    "Dev chat for the Riot/Web dev team": "დეველოპერების ჩატი Riot/ვებ დეველოპერების გუნდთან",
+    "Dev chat for the Dendrite dev team": "დეველოპერების ჩატი Dendrite-ის დეველოპერების გუნდთან",
+    "Co-ordination for Riot translators": "კოორდინაცია Riot-ის მთარგმნელებისთვის"
+}

From 8a167d2743b8a6bcfe6922d4bbc11f7f58fd51de Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 16 Aug 2018 15:04:17 +0100
Subject: [PATCH 18/31] Add Norsk & Italian

---
 scripts/copy-res.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/copy-res.js b/scripts/copy-res.js
index a2b8788a..70a06411 100755
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -24,10 +24,12 @@ const INCLUDE_LANGS = [
     {'value': 'fr', 'label': 'Français'},
     {'value': 'gl', 'label': 'Galego'},
     {'value': 'hu', 'label': 'Magyar'},
+    {'value': 'it', 'label': 'Italiano'},
     {'value': 'ko', 'label': '한국어'},
     {'value': 'lv', 'label': 'Latviešu'},
     {'value': 'nb_NO', 'label': 'Norwegian Bokmål'},
     {'value': 'nl', 'label': 'Nederlands'},
+    {'value': 'nn', 'label': 'Norsk Nynorsk'},
     {'value': 'pl', 'label': 'Polski'},
     {'value': 'pt', 'label': 'Português'},
     {'value': 'pt_BR', 'label': 'Português do Brasil'},

From 37e848eee9f0855810c12d0c4e1ea33c6cc32cff Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 16 Aug 2018 15:09:57 +0100
Subject: [PATCH 19/31] Bump electron version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7414938d..ec05afe0 100644
--- a/package.json
+++ b/package.json
@@ -144,7 +144,7 @@
   "build": {
     "appId": "im.riot.app",
     "category": "Network",
-    "electronVersion": "2.0.5",
+    "electronVersion": "2.0.7",
     "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
     "asar": false,
     "dereference": true,

From 1a73284b0c9956db213114cb76ce6bd7579b66da Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 16 Aug 2018 15:43:17 +0100
Subject: [PATCH 20/31] js-sdk & react-sdk rc.1

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ec05afe0..d2c6acca 100644
--- a/package.json
+++ b/package.json
@@ -64,8 +64,8 @@
     "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
-    "matrix-js-sdk": "0.10.7",
-    "matrix-react-sdk": "0.13.0",
+    "matrix-js-sdk": "0.10.8-rc.1",
+    "matrix-react-sdk": "0.13.1-rc.1",
     "modernizr": "^3.1.0",
     "prop-types": "^15.5.10",
     "react": "^15.6.0",

From c46963807e6517cc73e67ab279f813db880bd720 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 16 Aug 2018 15:46:28 +0100
Subject: [PATCH 21/31] v0.16.1-rc.1

---
 electron_app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electron_app/package.json b/electron_app/package.json
index c006db74..c203185b 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.16.0",
+  "version": "0.16.1-rc.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From b579285f23a155f8f5440b94581c5f57dd069d50 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 16 Aug 2018 15:47:49 +0100
Subject: [PATCH 22/31] Prepare changelog for v0.16.1-rc.1

---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26b59586..6f9c027b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+Changes in [0.16.1-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.1-rc.1) (2018-08-16)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.0...v0.16.1-rc.1)
+
+ * Update from Weblate.
+   [\#7178](https://github.com/vector-im/riot-web/pull/7178)
+ * CSS for MAU warning bar
+   [\#7152](https://github.com/vector-im/riot-web/pull/7152)
+ * CSS for user limit error
+   [\#7139](https://github.com/vector-im/riot-web/pull/7139)
+ * Unpin sanitize-html
+   [\#7132](https://github.com/vector-im/riot-web/pull/7132)
+ * Pin sanitize-html to 0.18.2
+   [\#7129](https://github.com/vector-im/riot-web/pull/7129)
+
 Changes in [0.16.0](https://github.com/vector-im/riot-web/releases/tag/v0.16.0) (2018-07-30)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.0-rc.2...v0.16.0)

From 472e55cea5fe4a4d9993a434354208bc87333e7c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 16 Aug 2018 15:47:50 +0100
Subject: [PATCH 23/31] v0.16.1-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d2c6acca..73501c0f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.16.0",
+  "version": "0.16.1-rc.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {

From 2a0cc21dfee07e800c22e2abb70219adfc43f852 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 20 Aug 2018 13:58:00 +0100
Subject: [PATCH 24/31] Released js-sdk & react-sdk

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 73501c0f..5f2738bd 100644
--- a/package.json
+++ b/package.json
@@ -64,8 +64,8 @@
     "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
-    "matrix-js-sdk": "0.10.8-rc.1",
-    "matrix-react-sdk": "0.13.1-rc.1",
+    "matrix-js-sdk": "0.10.8",
+    "matrix-react-sdk": "0.13.1",
     "modernizr": "^3.1.0",
     "prop-types": "^15.5.10",
     "react": "^15.6.0",

From 2ba60a78933009281d0906407e53932dbbd6d1a8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 20 Aug 2018 13:58:47 +0100
Subject: [PATCH 25/31] v0.16.1

---
 electron_app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electron_app/package.json b/electron_app/package.json
index c203185b..75209503 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.16.1-rc.1",
+  "version": "0.16.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From 0b09432b7eb3bc4c7808c8b761339f319e4bc265 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 20 Aug 2018 14:00:47 +0100
Subject: [PATCH 26/31] Prepare changelog for v0.16.1

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f9c027b..7477e825 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.16.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.1) (2018-08-20)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.1-rc.1...v0.16.1)
+
+ * No changes since rc.1
+
 Changes in [0.16.1-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.1-rc.1) (2018-08-16)
 ======================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.0...v0.16.1-rc.1)

From dd8ed7cc77f825f0f8687d7d188e0f623e3aa69a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 20 Aug 2018 14:00:47 +0100
Subject: [PATCH 27/31] v0.16.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5f2738bd..1617e168 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.16.1-rc.1",
+  "version": "0.16.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {

From 49523ba8d1215faa16d90d0ba66d112b953776b5 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 23 Aug 2018 15:31:26 +0100
Subject: [PATCH 28/31] New react-sdk for new server notices format

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1617e168..a6ee268e 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "matrix-js-sdk": "0.10.8",
-    "matrix-react-sdk": "0.13.1",
+    "matrix-react-sdk": "0.13.2",
     "modernizr": "^3.1.0",
     "prop-types": "^15.5.10",
     "react": "^15.6.0",

From 656d0e0ff4fe4bcb69059a4e88e85212b144b45c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 23 Aug 2018 15:32:22 +0100
Subject: [PATCH 29/31] v0.16.2

---
 electron_app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electron_app/package.json b/electron_app/package.json
index 75209503..f92dd63c 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.16.1",
+  "version": "0.16.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From 32ea24f8ce8611bce3fe00350dd3c266707ec2c3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 23 Aug 2018 15:33:59 +0100
Subject: [PATCH 30/31] Prepare changelog for v0.16.2

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7477e825..eae5b848 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.16.2](https://github.com/vector-im/riot-web/releases/tag/v0.16.2) (2018-08-23)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.1...v0.16.2)
+
+ * Support new server notices format
+
 Changes in [0.16.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.1) (2018-08-20)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.1-rc.1...v0.16.1)

From cdcdab82eb2c1d7588855b7deb4d9126026df56a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 23 Aug 2018 15:34:00 +0100
Subject: [PATCH 31/31] v0.16.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a6ee268e..9b4f814f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.16.1",
+  "version": "0.16.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {