Home
last modified time | relevance | path

Searched hist:"7 b092963487affc20ff53e7b4a6b9011bec70d83" (Results 1 – 3 of 3) sorted by relevance

/template/sprintdoc/lang/de/
H A Dsettings.php7b092963487affc20ff53e7b4a6b9011bec70d83 Wed Apr 19 13:44:01 UTC 2017 Jana Deutschländer <deutschlaender@cosmocode.de> Merge remote-tracking branch 'origin/detailView'

# Conflicts:
# lang/de/settings.php
# lang/en/settings.php

/template/sprintdoc/lang/en/
H A Dsettings.php7b092963487affc20ff53e7b4a6b9011bec70d83 Wed Apr 19 13:44:01 UTC 2017 Jana Deutschländer <deutschlaender@cosmocode.de> Merge remote-tracking branch 'origin/detailView'

# Conflicts:
# lang/de/settings.php
# lang/en/settings.php

/template/sprintdoc/
H A Dstyle.ini7b092963487affc20ff53e7b4a6b9011bec70d83 Wed Apr 19 13:44:01 UTC 2017 Jana Deutschländer <deutschlaender@cosmocode.de> Merge remote-tracking branch 'origin/detailView'

# Conflicts:
# lang/de/settings.php
# lang/en/settings.php