]> source.dussan.org Git - nextcloud-server.git/commit
Merge remote-tracking branch 'upstream/master'
authorsherbrecher <oss@herbrecher.de>
Fri, 15 Mar 2013 16:50:02 +0000 (17:50 +0100)
committersherbrecher <oss@herbrecher.de>
Fri, 15 Mar 2013 16:50:02 +0000 (17:50 +0100)
commitec45a8433dba8140565728500050035ddad0a20e
treefff9bf7677cf66dabdc2906f54e334c66e3d6dda
parentd2b3a9fb3bfa4d434d7d797019ec0cadec392a2b
parentebb2cb340349929e5e1d8e73e0f4523756f69d73
Merge remote-tracking branch 'upstream/master'

Conflicts:
apps/files_external/templates/settings.php
apps/files_external/templates/settings.php