# Conflicts:
#	app/assets/javascripts/main.js
#	app/assets/javascripts/project.js
#	app/assets/javascripts/repo/lib/editor_options.js
#	app/helpers/button_helper.rb
#	app/models/environment.rb
#	spec/javascripts/repo/lib/editor_options_spec.js
#	spec/javascripts/repo/lib/editor_spec.js
#	spec/models/project_spec.rb

[ci skip]