# Conflicts:
#	app/assets/stylesheets/pages/projects.scss
#	app/models/project.rb
#	app/models/repository.rb

[ci skip]