Skip to content
GitLab
Explore
Sign in
Commit
52553c64
authored
Jul 08, 2013
by
Bart Visscher
Browse files
Merge branch 'master' into convert-oc_config
Conflicts: lib/config.php
parents
492a3573
02d2e41e
Changes
903
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