Skip to content
GitLab
Explore
Sign in
Commit
bc43dd70
authored
Feb 13, 2013
by
Thomas Müller
Browse files
Merge branch 'master' into fixing-1424-master
Conflicts: settings/js/users.js
parents
14e3d77d
68fa0b7d
Changes
451
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