Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master

# Conflicts:
#	css/plugins/edit.less
This commit is contained in:
Silke Pisulla 2017-02-14 09:26:02 +01:00
commit e1a580f40a
7 changed files with 16 additions and 16 deletions

View file

@ -44,7 +44,7 @@
clear: both;
}
#meta-box {
#spr__meta-box {
display: none;
}
}