]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-1354-master
authorThomas Mueller <thomas.mueller@tmit.eu>
Thu, 7 Feb 2013 09:44:28 +0000 (10:44 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Thu, 7 Feb 2013 09:44:28 +0000 (10:44 +0100)
commit5788d36c8d1e9869d8a645293805e3b0265ea238
tree80045c0eb1687652f956b3bdaccb1c765893d2e1
parent84f3c8b6cc1060203d807ee65545478ce34f93c4
parent35bd7a400d30fb27703d4fa02b107f9629845b7d
Merge branch 'master' into fixing-1354-master

Conflicts:
settings/admin.php
settings/templates/admin.php
lib/base.php
lib/util.php
settings/admin.php
settings/templates/admin.php