]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar
authorGeorg Ehrke <dev@georgswebsite.de>
Tue, 17 Jan 2012 14:57:29 +0000 (15:57 +0100)
committerGeorg Ehrke <dev@georgswebsite.de>
Tue, 17 Jan 2012 14:57:29 +0000 (15:57 +0100)
1  2 
apps/calendar/js/calendar.js

Simple merge