]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into movable_apps_2
authorGeorg Ehrke <dev@georgswebsite.de>
Fri, 27 Apr 2012 12:22:12 +0000 (14:22 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Fri, 27 Apr 2012 12:22:12 +0000 (14:22 +0200)
1  2 
apps/contacts/js/contacts.js

Simple merge