Changeset [8376e6daee922aaf8026b581120682fd6f8467e6] by Matias Korhonen
Revision 8376e6daee922aaf8026b581120682fd6f8467e6,
committed by Matias Korhonen
· July 2nd, 2009 @ 12:49 PM
Merge branch 'master' of git://github.com/jcxplorer/hhlc http://github.com/k33l0r/hhlc/co...
29 changed files
-
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/home_controller.rb -
M
app/controllers/admin/news_controller.rb -
M
app/controllers/admin/users_controller.rb -
M
app/controllers/administration_controller.rb -
M
app/controllers/application_controller.rb -
M
app/controllers/contact_controller.rb -
M
app/controllers/home_controller.rb -
M
app/controllers/profiles_controller.rb -
M
app/controllers/sessions_controller.rb -
M
app/controllers/users_controller.rb -
M
app/helpers/application_helper.rb -
M
app/models/event.rb -
M
app/models/user.rb -
M
app/views/admin/articles/_form.html.erb -
M
app/views/admin/articles/index.html.erb -
M
app/views/admin/events/_form.html.erb -
M
app/views/admin/news/_form.html.erb -
M
app/views/admin/news/edit.html.erb -
M
app/views/layouts/admin.html.erb -
M
app/views/profiles/show.html.erb -
M
app/views/users/_userlinks.html.erb -
M
config/initializers/modules.rb -
M
lib/authentication.rb -
M
lib/authorization.rb -
M
lib/diff.rb -
M
lib/modules/diff.rb