Merge branch 'develop' into anoa/jitsi_ptt
* develop: (22 commits) v1.3.0 Prepare changelog for v1.3.0 v1.3.0 Upgrade to JS SDK 2.2.0 and React SDK 1.4.0 Remove reactions feature flag from docs and config Remove edits feature flag from docs and config Remove reactions feature flag from docs and config Remove edits feature flag from docs and config cachebust config file requests v1.3.0-rc.3 Prepare changelog for v1.3.0-rc.3 v1.3.0-rc.3 react-sdk rc.3 v1.3.0-rc.2 Prepare changelog for v1.3.0-rc.2 v1.3.0-rc.2 Upgrade to JS SDK 2.2.0-rc.2 and React SDK 1.4.0-rc.2 Convert install-app-deps to subcommand v1.3.0-rc.1 Prepare changelog for v1.3.0-rc.1 ...
This commit is contained in:
commit
62cfd3ba12
9 changed files with 95 additions and 34 deletions
|
@ -2,7 +2,7 @@
|
|||
"name": "riot-web",
|
||||
"productName": "Riot",
|
||||
"main": "src/electron-main.js",
|
||||
"version": "1.2.4",
|
||||
"version": "1.3.0",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"dependencies": {
|
||||
|
|
|
@ -30,9 +30,7 @@
|
|||
}
|
||||
},
|
||||
"features": {
|
||||
"feature_lazyloading": "enable",
|
||||
"feature_reactions": "enable",
|
||||
"feature_message_editing": "enable"
|
||||
"feature_lazyloading": "enable"
|
||||
},
|
||||
"enable_presence_by_hs_url": {
|
||||
"https://matrix.org": false
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue