summaryrefslogtreecommitdiffstats
path: root/core/templates
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-04-22 13:20:50 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-04-22 13:20:50 +0200
commite888f4d9bc40dddd197f858d3fe585df631189b6 (patch)
tree9d8ac7fe47108628340f6021f494995a25200ab4 /core/templates
parente2f64394f3ba3ec7a1e653a654982dbfe9c4370b (diff)
parent1bba4456420d1824ab6d58f3d9bb523fcde5c4c2 (diff)
downloadnextcloud-server-e888f4d9bc40dddd197f858d3fe585df631189b6.tar.gz
nextcloud-server-e888f4d9bc40dddd197f858d3fe585df631189b6.zip
Merge branch 'master' into sabredav_1.6
Diffstat (limited to 'core/templates')
0 files changed, 0 insertions, 0 deletions