Commit Graph

3 Commits

Author SHA1 Message Date
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
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
did 99e442673c namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00