OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/4137/head
RiotTranslate 2017-06-01 10:59:37 +00:00
parent 0940d57d42 cb33302f10
commit 08646f102f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electron_app/package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web", "name": "riot-web",
"productName": "Riot", "productName": "Riot",
"main": "src/electron-main.js", "main": "src/electron-main.js",
"version": "0.9.10", "version": "0.10.0-rc.1",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.", "author": "Vector Creations Ltd.",
"dependencies": { "dependencies": {

2
scripts/copy-res.js
View File

@ -13,8 +13,10 @@ const INCLUDE_LANGS = [
'en_EN', 'en_EN',
'da', 'da',
'de_DE', 'de_DE',
'es',
'fr', 'fr',
'be', 'be',
'nl',
'pt', 'pt',
'pt_BR', 'pt_BR',
'ru', 'ru',