Skip to content
Commit 9832a081 authored by Bart Visscher's avatar Bart Visscher
Browse files

Merge branch 'master' into fullcalendar 

Conflicts:
	apps/calendar/index.php
parents dc9c5f10 abf33d32
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment