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

This commit is contained in:
Weblate 2019-01-17 10:16:34 +00:00
commit e0b4875615
2 changed files with 2 additions and 2 deletions

View File

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

View File

@ -26,7 +26,7 @@ limitations under the License.
*/
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() {
rageshake.init().then(() => {