Files
gitlabhq/app/assets/javascripts
Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
2015-02-24 14:54:39 +01:00
..
2014-10-07 11:17:04 -05:00
2014-10-20 23:03:33 +02:00
2014-12-30 11:46:47 +02:00
2015-02-09 15:34:06 +02:00
2014-12-30 11:46:48 +02:00
2015-02-17 16:14:49 -08:00
2014-09-01 11:49:17 +02:00