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

# Conflicts:
#	css/area_nav-pagetools.less
#	css/base_mixins.less
This commit is contained in:
Jana Deutschländer 2017-01-02 15:15:47 +01:00
commit 4e16e9e596
15 changed files with 390 additions and 199 deletions

View file

@ -76,6 +76,7 @@ css/area_nav-pagetools.less = all
css/plugins/magic-matcher.less = all
css/plugins/do_tasks.less = all
; _____________ print styles _____________
css/print.css = print