Merge remote-tracking branch 'origin/develop' into develop

2017-06-01 10:59:37 +00:00 · 2017-06-01 10:59:37 +00:00 · 08646f102f
commit 08646f102f
parent 0940d57d42 cb33302f10
2 changed files with 3 additions and 1 deletions
--- 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.9.10",
+  "version": "0.10.0-rc.1",
  "description": "A feature-rich client for Matrix.org",
  "author": "Vector Creations Ltd.",
  "dependencies": {
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@ -13,8 +13,10 @@ const INCLUDE_LANGS = [
    'en_EN',
    'da',
    'de_DE',
+    'es',
    'fr',
    'be',
+    'nl',
    'pt',
    'pt_BR',
    'ru',