]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into appframework-master
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 25 Sep 2013 07:52:12 +0000 (09:52 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 25 Sep 2013 07:52:12 +0000 (09:52 +0200)
commitdb39fede97dc4d6b9a5caf739cb2c03b4dbdd21d
tree0d8c9f25deb067ce23e901c72f2af842e9002341
parent843f15f3489856b518a30de4c803740844232209
parent2d12e52769a30ba37d5760b1194f613bcc71035b
Merge branch 'master' into appframework-master

Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
apps/files/ajax/rawlist.php
apps/files/lib/helper.php
apps/files_sharing/public.php
apps/files_trashbin/lib/helper.php
lib/base.php