Merge remote-tracking branch 'origin/develop' into release-v0.12.7

package.json

@@ -152,7 +152,7 @@
   "build": {
     "appId": "im.riot.app",
     "category": "Network",
-    "electronVersion": "1.7.5",
+    "electronVersion": "1.7.9",
     "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
     "asar": false,
     "dereference": true,

src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss

@@ -34,6 +34,11 @@ limitations under the License.
     width: 40%;
 }
 
+/* Until the button is wired up */
+.mx_MyGroups_joinBox {
+    visibility: hidden;
+}
+
 .mx_MyGroups_joinCreateHeader {
     font-weight: bold;
     margin-bottom: 10px;