Merge branch 'devel' into dev/pluginLifecycleMgmt

This commit is contained in:
Gina Häußge 2015-04-15 15:30:26 +02:00
commit d5e7149f99
3 changed files with 2 additions and 3 deletions

View file

@ -9,7 +9,6 @@
.modal-open {
overflow: hidden;
position: fixed;
}

File diff suppressed because one or more lines are too long

View file

@ -936,6 +936,6 @@ textarea.block {
.scrollable {
height: 100%;
overflow-y: scroll;
overflow: auto;
-webkit-overflow-scrolling: touch;
}