]> source.dussan.org Git - nextcloud-server.git/commit
resolve merge conflicts from rebase
authorArthur Schiwon <blizzz@owncloud.com>
Thu, 17 Oct 2013 17:40:59 +0000 (19:40 +0200)
committerArthur Schiwon <blizzz@owncloud.com>
Thu, 17 Oct 2013 17:40:59 +0000 (19:40 +0200)
commit6acd01d9f287def7cf4f35fbe71c069dd97eff8b
treeea42f8d0d77bc2f2b299fa3168ddd158046bc83d
parent0b90cc0b4b529e8d4a4e6fb173d2c56678071362
resolve merge conflicts from rebase
apps/user_ldap/lib/configuration.php
apps/user_ldap/lib/connection.php