Resolve merge conflict
authorChristian Johansen <christian@gitorious.org>
Fri, 14 Oct 2011 10:23:56 +0000 (12:23 +0200)
committerChristian Johansen <christian@gitorious.org>
Fri, 14 Oct 2011 10:23:56 +0000 (12:23 +0200)
commit25413c879192ca49449bd5bdf4624b6ff6973dd1
tree13f2e47134f76dcf0cd97124b201373edb4c3e03
parent03470290a0dfd4a0cf4871304c7591cb45628422
parent9510251599ef8b2fe94056cc7597cabb9fffbf28
Resolve merge conflict
15 files changed:
Gemfile
Gemfile.lock
app/controllers/application_controller.rb
app/controllers/commits_controller.rb
app/helpers/application_helper.rb
app/helpers/event_rendering_helper.rb
app/helpers/repositories_helper.rb
app/helpers/routing_helper.rb
app/helpers/trees_helper.rb
config/locales/en.rb
config/routes.rb
public/stylesheets/base.css
public/stylesheets/content.css
public/stylesheets/sidebar.css
test/functional/pages_controller_test.rb