]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fullcalendar
authorBart Visscher <bartv@thisnet.nl>
Mon, 24 Oct 2011 20:40:22 +0000 (22:40 +0200)
committerBart Visscher <bartv@thisnet.nl>
Mon, 24 Oct 2011 20:40:22 +0000 (22:40 +0200)
commit9832a0817dfe975dd768e24b1f51b0591bbfa3b3
tree7252d1541e7b34ad1d04d7864f5ecd20b7154c4b
parentdc9c5f10f57bf3d3c375e6fe1f89a358ca1947a8
parentabf33d32b9987cc22cd42e6d65ac13720c7f1c7c
Merge branch 'master' into fullcalendar

Conflicts:
apps/calendar/index.php
apps/calendar/index.php