Skip to content
GitLab
Explore
Sign in
Commit
8b08b1b4
authored
Oct 02, 2013
by
Björn Schießle
Browse files
Merge branch 'master' into sharing_mail_notification_master
Conflicts: lib/private/util.php
parents
084f76fd
535ed836
Changes
497
Hide whitespace changes
Inline
Side-by-side
Preview
0%
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