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

2017-11-29 18:50:31 +00:00
parent 7153d03660 72563e6114
commit 8da2a29f86
1 changed files with 1 additions and 0 deletions
--- a/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupUserSettings.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupUserSettings.scss
@@ -19,4 +19,5 @@ limitations under the License.
    border: 1px solid $primary-hairline-color;
    border-radius: 3px;
    margin-right: 32px;
+    overflow: hidden;
 }