Skip to content
GitLab
Explore
Sign in
Commit
e0173303
authored
Jan 14, 2013
by
Björn Schießle
Browse files
merge conflict fixed, settings-personal.php is no longer needed
Conflicts: apps/files_versions/templates/settings-personal.php
parents
b69328e1
d276d21c
Changes
9
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