]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into sharing_mail_notification_master
authorBjoern Schiessle <schiessle@owncloud.com>
Mon, 2 Sep 2013 12:41:46 +0000 (14:41 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Mon, 2 Sep 2013 12:41:46 +0000 (14:41 +0200)
commitb918c06be60eea9edde26b05621898627c71130d
treef16cbad18677ee2f3262474f5668603adf52896e
parent4bbefdf608fdf930fa6fd1f783d6f58267752394
parent06870a6e390f68d741893b4454b8fe4063404ca8
Merge branch 'master' into sharing_mail_notification_master

Conflicts:
lib/util.php
apps/files/index.php
apps/files/templates/index.php
core/ajax/share.php
db_structure.xml
lib/util.php