Mario Visic 9a1a0f016f Merge branch 'master' into rails_3_1 ... Conflicts: app/models/content_type.rb config/boot.rb		2011-12-15 22:29:07 +08:00
..
environments	namespace controllers, models, ...etc (wip)	2011-10-31 00:02:41 +01:00
initializers	fix some bugs + refactor look and feel of the import screens (wip)	2011-12-08 07:47:17 -08: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-12-15 22:29:07 +08: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