]> source.dussan.org Git - nextcloud-server.git/commit
Resolve merge conflict
authorArthur Schiwon <blizzz@owncloud.com>
Sun, 18 Aug 2013 11:33:59 +0000 (13:33 +0200)
committerArthur Schiwon <blizzz@owncloud.com>
Fri, 27 Sep 2013 11:34:15 +0000 (13:34 +0200)
commit1a020e0696b5b2876044f419c7f02525b0bb9942
tree581f373b32516b83bd64e7222a0c243af77cc5bf
parentf47ff13abf65f0c66082333a55b8a108697aae97
Resolve merge conflict
apps/user_ldap/lib/connection.php