# Conflicts:
#	app/assets/javascripts/notes/stores/getters.js
#	app/models/application_setting.rb
#	app/models/commit_status.rb
#	db/schema.rb

[ci skip]