Merge branch 'develop' into matthew/orderable-roomlist

This commit is contained in:
Matthew Hodgson 2015-11-09 16:04:20 +00:00
commit 23c93de82e
10 changed files with 133 additions and 23 deletions

View file

@ -35,7 +35,7 @@ limitations under the License.
-webkit-order: 1;
order: 1;
height: 21px;
height: 40px;
}
.mx_MatrixChat_toolbarShowing {