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
..
httparty	fix issue #91	2011-06-22 15:57:24 -07:00
liquid	Use contents_custom_fields instead of content_custom_fields	2011-12-05 22:29:32 +08:00
routing	Fixed some broken tests, mainly due to routing issues. Down to 68 failing tests.	2011-12-06 21:42:41 +08:00
configuration_spec.rb	fix bug #111	2011-07-09 00:47:05 +02:00
export_spec.rb	Merge branch 'master' into rails_3_1	2011-12-15 22:29:07 +08:00
import_spec.rb	Use contents_custom_fields instead of content_custom_fields	2011-12-05 22:29:32 +08:00
render_spec.rb	Lots of spec fixes (mostly namespacing), down to 107 failing specs.	2011-11-26 17:24:34 +11:00