gitlab-org--gitlab-foss/features/steps/snippets
Dmitriy Zaporozhets c31c8c55a4
Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/markdown_render.rb
2014-09-22 20:56:12 +03:00
..
discover.rb Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step 2014-09-22 20:56:12 +03:00
snippets.rb Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step 2014-09-22 20:56:12 +03:00
user.rb Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step 2014-09-22 20:56:12 +03:00