Skip to content
GitLab
Explore
Sign in
Commit
65413a95
authored
Sep 03, 2013
by
Christopher Schäpers
Browse files
Merge branch 'master' into oc_avatars
Conflicts: config/config.sample.php
parents
e7e3f1b8
431cf06e
Changes
242
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