]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar_dropimport
authorGeorg Ehrke <dev@georgswebsite.de>
Thu, 17 May 2012 20:17:06 +0000 (22:17 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Thu, 17 May 2012 20:17:06 +0000 (22:17 +0200)
1  2 
apps/calendar/js/calendar.js

Simple merge