Skip to content
Snippets Groups Projects
Commit fe125f8d authored by Fatih Acet's avatar Fatih Acet
Browse files

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown

# Conflicts:
#	app/assets/javascripts/lib/common_utils.js.coffee
parents 6f8626de 5d16d50c
No related branches found
No related tags found
No related merge requests found
Showing
with 266 additions and 151 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment