Mario Visic 9f56eecd56 Merge branch 'master' into rails_3_1 ... Conflicts: Gemfile Gemfile.lock config/boot.rb		2011-11-27 20:33:45 +11:00
..
environments	namespace controllers, models, ...etc (wip)	2011-10-31 00:02:41 +01:00
initializers	rebuilding the editing page for the site (wip)	2011-11-25 15:10:56 +01:00
locales	namespace controllers, models, ...etc (wip)	2011-10-31 00:02:41 +01:00
application.rb	fixing assets (wip)	2011-11-01 01:58:44 +01:00
boot.rb	Merge branch 'master' into rails_3_1	2011-11-27 20:33:45 +11:00
environment.rb	namespace controllers, models, ...etc (wip)	2011-10-31 00:02:41 +01:00
mongoid.yml	namespace controllers, models, ...etc (wip)	2011-10-31 00:02:41 +01:00
routes.rb	working on fixing issues with devise (wip)	2011-11-04 16:55:51 +01:00