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
..
app	working on fixing issues with devise (wip)	2011-11-04 16:55:51 +01:00
config	Merge branch 'master' into rails_3_1	2011-12-15 22:29:07 +08:00
lib/assets	namespace controllers, models, ...etc (wip)	2011-10-31 00:02:41 +01:00
log	fix module collisions and missing namespaces all over the templates (wip)	2011-11-08 01:11:15 +01:00
public	namespace controllers, models, ...etc (wip)	2011-10-31 00:02:41 +01:00
script	namespace controllers, models, ...etc (wip)	2011-10-31 00:02:41 +01:00
config.ru	namespace controllers, models, ...etc (wip)	2011-10-31 00:02:41 +01:00
Rakefile	namespace controllers, models, ...etc (wip)	2011-10-31 00:02:41 +01:00