OSDN Git Service

Merge branch 'issue_im'
authorgitlabhq <m@gitlabhq.com>
Sat, 15 Oct 2011 17:54:39 +0000 (20:54 +0300)
committergitlabhq <m@gitlabhq.com>
Sat, 15 Oct 2011 17:54:39 +0000 (20:54 +0300)
commit99777cab2a64a94cc6798a6f1ac562850bc08172
treee64cc06d6f704673e4495caeea749ceb9f51eb91
parentc37492b5dcd8188bc2f738e7a8994855926a2d83
parente6bba9be4f0400471170e9d86f3ef15344416f2f
Merge branch 'issue_im'

Conflicts:
config/initializers/rails_footnotes.rb
app/models/project.rb
config/routes.rb