Changeset [a061ee0c9208ced9ef4d206a9cec13c7ed342a6c] by Joao Carlos

May 1st, 2009 @ 03:34 PM

Merge commit 'matt/master'

Conflicts:

.gitmodules

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

Committed by Joao Carlos

  • M .gitignore
  • M .gitmodules
  • M README.textile
  • M app/controllers/search_controller.rb
  • M app/models/article.rb
  • M app/models/event.rb
  • M app/models/news.rb
  • M app/views/home/index.html.erb
  • M app/views/layouts/application.html.erb
  • M app/views/search/articles.html.erb
  • M app/views/search/events.html.erb
  • M app/views/search/news.html.erb
  • M app/views/search/results.html.erb
  • M config/environment.rb
  • M config/ferret_server.yml
  • M config/initializers/setup_xapit.rb
  • 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.