bf4e4f02ed
Conflicts: app/controllers/comments_controller.rb app/views/comments/edit.html.haml app/views/issues/show.html.haml db/schema.rb |
||
---|---|---|
.. | ||
controllers | ||
factories | ||
helpers/settings | ||
mailers | ||
models | ||
routing | ||
support | ||
tests.git | ||
spec_helper.rb |