-
Bart Visscher authoredConflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php
Bart Visscher authoredConflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php
Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php
Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php