dokuwiki-template-sprintdoc.../lang
Jana Deutschländer d3e6e376f1 Merge branch 'master' into 'spis-master'
# Conflicts:
#   lang/en/lang.php
2017-04-26 16:42:17 +02:00
..
de Merge branch 'master' into 'spis-master' 2017-04-26 16:42:17 +02:00
en Merge branch 'master' into 'spis-master' 2017-04-26 16:42:17 +02:00