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

# Conflicts:
#	lang/de/lang.php
This commit is contained in:
Silke Pisulla 2017-04-26 09:37:42 +02:00
commit fabd75acdf
25 changed files with 129 additions and 118 deletions

View file

@ -42,7 +42,7 @@
padding: .8em 0 1em 1em;
span.outkey {
background-color: @ini_background_content;
background-color: @ini_background;
color: inherit;
font-size: 90%;