# Conflicts:
#	app/assets/javascripts/dispatcher.js
#	app/uploaders/personal_file_uploader.rb
#	doc/user/project/milestones/index.md

[ci skip]