summaryrefslogtreecommitdiffstats
path: root/core/templates
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-06-18 15:59:39 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-06-18 15:59:39 +0200
commit6bd0a158f7ae71320a1b0c00e187633200561269 (patch)
tree52dd70f3c9d4e9fb22b58f450fb7cfb71af5efe7 /core/templates
parente31c9a7b6f88137810b541c7065660a6c0faa470 (diff)
parent2f00384b5124ec0b3f3703d73a11a129aff93a62 (diff)
downloadnextcloud-server-6bd0a158f7ae71320a1b0c00e187633200561269.tar.gz
nextcloud-server-6bd0a158f7ae71320a1b0c00e187633200561269.zip
Merge branch 'master' into oc_error
Diffstat (limited to 'core/templates')
0 files changed, 0 insertions, 0 deletions