Merge pull request #5216 from bladealslayer/feature/flowdock_integration

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

Fri, 4 Oct 2013 15:00:51 +0000 (08:00 -0700)

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

Fri, 4 Oct 2013 15:00:51 +0000 (08:00 -0700)
author Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 4 Oct 2013 15:00:51 +0000 (08:00 -0700)
committer Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 4 Oct 2013 15:00:51 +0000 (08:00 -0700)
diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge
diff --cc app/models/project.rb
Simple merge
author	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Fri, 4 Oct 2013 15:00:51 +0000 (08:00 -0700)
committer	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Fri, 4 Oct 2013 15:00:51 +0000 (08:00 -0700)
		1	2
Gemfile	patch \|	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	patch \|	diff1 \|	diff2 \|	blob \| history
app/models/project.rb	patch \|	diff1 \|	diff2 \|	blob \| history