gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Weblate 2019-01-17 10:16:34 +00:00
parent bbfd1448c5 3236f72031
commit e0b4875615
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -150,7 +150,7 @@
}, },
"build": { "build": {
"appId": "im.riot.app", "appId": "im.riot.app",
"electronVersion": "3.0.10", "electronVersion": "4.0.1",
"files": [ "files": [
"node_modules/**", "node_modules/**",
"src/**", "src/**",

2
src/vector/rageshakesetup.js
View File

@ -26,7 +26,7 @@ limitations under the License.
*/ */
import rageshake from "matrix-react-sdk/lib/rageshake/rageshake"; import rageshake from "matrix-react-sdk/lib/rageshake/rageshake";
import SdkConfig from "matrix-react-sdk/src/SdkConfig"; import SdkConfig from "matrix-react-sdk/lib/SdkConfig";
function initRageshake() { function initRageshake() {
rageshake.init().then(() => { rageshake.init().then(() => {