Merge pull request #3834 from ichord/gfm-autocomp

author Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Wed, 8 May 2013 11:18:16 +0000 (04:18 -0700)

committer Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Wed, 8 May 2013 11:18:16 +0000 (04:18 -0700)
author Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Wed, 8 May 2013 11:18:16 +0000 (04:18 -0700)
committer Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Wed, 8 May 2013 11:18:16 +0000 (04:18 -0700)
diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge
diff --cc config/routes.rb
Simple merge
diff --cc spec/routing/project_routing_spec.rb
Simple merge
author	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Wed, 8 May 2013 11:18:16 +0000 (04:18 -0700)
committer	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Wed, 8 May 2013 11:18:16 +0000 (04:18 -0700)
		1	2
Gemfile	patch \|	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	patch \|	diff1 \|	diff2 \|	blob \| history
config/routes.rb	patch \|	diff1 \|	diff2 \|	blob \| history
spec/routing/project_routing_spec.rb	patch \|	diff1 \|	diff2 \|	blob \| history