Skip to content
GitLab
Explore
Sign in
Commit
077ea94f
authored
May 03, 2012
by
Bart Visscher
Browse files
Merge commit 'refs/merge-requests/89' of
git://gitorious.org/owncloud/owncloud
Conflicts: apps/calendar/ajax/events.php
parents
b62a8ba0
62da0bae
Loading
Loading
Loading
Changes
2
Hide whitespace changes
Inline
Side-by-side
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment