Skip to content
GitLab
Explore
Sign in
Commit
14a53819
authored
Apr 03, 2014
by
Thomas Müller
Browse files
Merge branch 'master' into fs-backend-registration
Conflicts: apps/files_external/templates/settings.php
parents
c0ebc1df
e2969062
Changes
3
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