]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar
authorGeorg Ehrke <ownclouddev@georgswebsite.de>
Thu, 29 Dec 2011 18:16:33 +0000 (19:16 +0100)
committerGeorg Ehrke <ownclouddev@georgswebsite.de>
Thu, 29 Dec 2011 18:16:33 +0000 (19:16 +0100)
1  2 
apps/calendar/js/calendar.js

Simple merge