gitlabhq/features
Riyad Preukschas db2c15369c Merge branch 'master' into discussions
Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb
2012-12-23 01:03:57 +01:00
..
admin Improve admin views for project and groups 2012-11-28 18:04:28 +01:00
dashboard Spinach test added 2012-11-28 19:59:19 +02:00
group More group tests with spinach 2012-10-22 21:42:06 +03:00
profile Improve user feedback on the Profile > Design page 2012-11-21 15:01:40 -05:00
project Merge branch 'master' into discussions 2012-12-23 01:03:57 +01:00
steps Merge branch 'master' into discussions 2012-12-23 01:03:57 +01:00
support Update uses of Gitolite.config.foo settings 2012-12-20 16:54:28 +01:00