Skip to content
Snippets Groups Projects
Commit 3d81f1da authored by James Lopez's avatar James Lopez
Browse files

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4 

# Conflicts:
#	.gitlab-ci.yml
parents ba07a4c9 0e51ca7c
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 7 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment