Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into #15643

# Conflicts:
#	app/assets/stylesheets/pages/issuable.scss
This commit is contained in:
Fatih Acet
2016-05-23 23:08:00 +03:00
664 changed files with 12591 additions and 2251 deletions
@@ -1,5 +1,6 @@
#= require bootstrap
#= require select2
#= require lib/type_utility
#= require gl_dropdown
#= require api
#= require project_select