merge develop

2018-07-09 17:50:07 +01:00 · 2018-07-09 17:50:07 +01:00 · efdc5430d7
commit efdc5430d7
parent 6299e188a4 e61317284b
176 changed files with 7537 additions and 3401 deletions
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@ -70,6 +70,7 @@ limitations under the License.
    flex: 1;
    display: flex;
    flex-direction: column;
+    cursor: text;
 }

 .mx_MessageComposer_input {