]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into sharing_mail_notification_master
authorBjoern Schiessle <schiessle@owncloud.com>
Thu, 5 Sep 2013 11:39:45 +0000 (13:39 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Thu, 5 Sep 2013 11:39:45 +0000 (13:39 +0200)
commitf8563ec5831713b341db1b2cd480328912818607
tree49c37ae10321b8490cb9d87104422f8a460c6301
parentfd7469db9e1cd1fd85e3a8a18aac87c7040ec8e7
parent0527fb05ad4106db199bf3937b753563061c39bf
Merge branch 'master' into sharing_mail_notification_master

increased version number to trigger db update

Conflicts:
lib/util.php
apps/files/templates/index.php
lib/public/share.php
lib/util.php
settings/admin.php