merge develop

2018-07-09 17:50:07 +01:00
parent 6299e188a4 e61317284b
commit efdc5430d7
176 changed files with 7536 additions and 3400 deletions
@@ -70,6 +70,7 @@ limitations under the License.
    flex: 1;
    display: flex;
    flex-direction: column;
+    cursor: text;
 }

 .mx_MessageComposer_input {