]> source.dussan.org Git - nextcloud-server.git/commit
merge master with resolved conflicts
authorArthur Schiwon <blizzz@owncloud.com>
Wed, 23 Oct 2013 10:01:45 +0000 (12:01 +0200)
committerArthur Schiwon <blizzz@owncloud.com>
Wed, 23 Oct 2013 10:01:45 +0000 (12:01 +0200)
commitd78a80a6892bdf47388329d7d426ccab6a36cf20
treed993a6fecb3277f86d457e0a952aeb2dc5f9590f
parent76a195a0be5d36c090c05ce60e02466e9783fea3
parent2d14daf36bf6c808e55895c78b42144942b73246
merge master with resolved conflicts
apps/user_ldap/lib/access.php