Skip to content
GitLab
Explore
Sign in
Commit
b918c06b
authored
Sep 02, 2013
by
Björn Schießle
Browse files
Merge branch 'master' into sharing_mail_notification_master
Conflicts: lib/util.php
parents
4bbefdf6
06870a6e
Changes
506
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