]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into sharing_mail_notification_master
authorBjoern Schiessle <schiessle@owncloud.com>
Fri, 4 Oct 2013 10:30:49 +0000 (12:30 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Fri, 4 Oct 2013 10:30:49 +0000 (12:30 +0200)
commit51295e9a6b9cd8e351132e988858b5d4bd223968
tree7d2da02957552a8ac49eb6f2f3bd6b08e1049406
parenta223cf769a670c1c8926baf4ded445af300d056d
parent514d7a884a5211fe246487421ea8103202d004d7
Merge branch 'master' into sharing_mail_notification_master

Conflicts:
apps/files/index.php
apps/files/templates/index.php
apps/files/index.php
apps/files/templates/index.php
lib/private/util.php