Merge branch 'live' into 'master'

Remerge Relase-Branch into Master

See merge request !32
This commit is contained in:
Jana Deutschländer 2017-04-18 13:06:57 +02:00
commit c838ed49ec

View file

@ -1,7 +1,7 @@
base sprintdoc
author Jana Deutschlaender
email deutschlaender@cosmocode.de
date 2016-12-05
date 2017-04-13
name sprintDoc Template
desc DokuWiki Template for sprintDoc Project
url FIXME URL