Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-12
# Conflicts: # app/assets/javascripts/boards/mixins/sortable_default_options.js # app/assets/javascripts/members.js # config/application.rb # ee/app/assets/images/illustrations/epics/roadmap.svg # ee/app/assets/images/illustrations/prometheus-graphs_empty.svg # ee/app/views/shared/empty_states/icons/_service_desk_callout.svg [ci skip]
Showing
Please register or sign in to comment