summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-06-30 22:08:36 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-06-30 22:08:36 +0200
commit4890bbb30d68d9b8afbadbe1b263035ecb9df676 (patch)
tree8f7e8c04879e0ad8fcaf1487fb1c9fb42bff88ef /core
parent376431fa0d20f6fade8d4e9cb7b1240e3e6eaf34 (diff)
parentfa5b31ac9ce8945140dbd4eae325d8c7aa5560e6 (diff)
downloadnextcloud-server-4890bbb30d68d9b8afbadbe1b263035ecb9df676.tar.gz
nextcloud-server-4890bbb30d68d9b8afbadbe1b263035ecb9df676.zip
Merge branch 'master' into calendar_import
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions