# Conflicts:
#	app/serializers/issue_sidebar_basic_entity.rb
#	app/serializers/issue_sidebar_entity.rb
#	app/serializers/issue_sidebar_extras_entity.rb
#	ee/app/serializers/draft_note_serializer.rb
#	spec/serializers/issue_serializer_spec.rb

[ci skip]