# Conflicts:
#	app/assets/stylesheets/framework.scss
#	lib/api/search.rb
#	spec/requests/api/search_spec.rb

[ci skip]