]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into oc_preview
authorGeorg Ehrke <georg@ownCloud.com>
Sat, 25 May 2013 10:16:25 +0000 (12:16 +0200)
committerGeorg Ehrke <georg@ownCloud.com>
Sat, 25 May 2013 10:16:25 +0000 (12:16 +0200)
commitaf57996d1ee66463999a33c0a80505fb6027e443
tree7faaa79547c152221929cc88e437c8a7265ae4a9
parent1bed3253abfc627a6dd698fc62a617285c1d7c84
parent6a6c18dfab494324d5fa7c2ea7a299830dd79612
Merge branch 'master' into oc_preview