]> source.dussan.org Git - nextcloud-server.git/commitdiff
merge from master
authorArthur Schiwon <blizzz@owncloud.com>
Sun, 4 Nov 2012 18:58:48 +0000 (19:58 +0100)
committerArthur Schiwon <blizzz@owncloud.com>
Sun, 4 Nov 2012 18:58:48 +0000 (19:58 +0100)
1  2 
apps/user_ldap/settings.php

Simple merge