summaryrefslogtreecommitdiffstats
path: root/l10n/gl
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-04-22 13:19:12 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-04-22 13:19:12 +0200
commit4c2cf35050032002d01978f53201723330ebfe16 (patch)
treecb931972aae1381d0d46aa934fa56f462e4c873a /l10n/gl
parent711aa229b882d3fc5e2fa8c22e6db2ec05642984 (diff)
parent1bba4456420d1824ab6d58f3d9bb523fcde5c4c2 (diff)
downloadnextcloud-server-4c2cf35050032002d01978f53201723330ebfe16.tar.gz
nextcloud-server-4c2cf35050032002d01978f53201723330ebfe16.zip
fix merge conflicts
Diffstat (limited to 'l10n/gl')
0 files changed, 0 insertions, 0 deletions