Changeset [150b411f81151b3755ceb46d97da13e77e3527bb] by Joao Carlos

May 7th, 2009 @ 11:14 PM

Merge branch 'master' of git://github.com/k33l0r/hhlc

Conflicts:

app/controllers/users_controller.rb

http://github.com/jcxplorer/hhlc...

Committed by Joao Carlos

  • M app/controllers/admin/articles_controller.rb
  • M app/controllers/admin/events_controller.rb
  • M app/controllers/admin/galleries_controller.rb
  • M app/controllers/admin/news_controller.rb
  • M app/controllers/admin/users_controller.rb
  • M app/controllers/articles_controller.rb
  • M app/controllers/events_controller.rb
  • M app/controllers/news_controller.rb
  • M app/controllers/users_controller.rb
  • M app/views/home/index.html.erb
  • M public/stylesheets/frontend.css
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

Ruby on Rails web application for the HAAGA-HELIA Linux Club.