summaryrefslogtreecommitdiffstats
path: root/apps/files/index.php
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-09-05 13:39:45 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2013-09-05 13:39:45 +0200
commitf8563ec5831713b341db1b2cd480328912818607 (patch)
tree49c37ae10321b8490cb9d87104422f8a460c6301 /apps/files/index.php
parentfd7469db9e1cd1fd85e3a8a18aac87c7040ec8e7 (diff)
parent0527fb05ad4106db199bf3937b753563061c39bf (diff)
downloadnextcloud-server-f8563ec5831713b341db1b2cd480328912818607.tar.gz
nextcloud-server-f8563ec5831713b341db1b2cd480328912818607.zip
Merge branch 'master' into sharing_mail_notification_master
increased version number to trigger db update Conflicts: lib/util.php
Diffstat (limited to 'apps/files/index.php')
0 files changed, 0 insertions, 0 deletions