Mario Visic 8ac8289394 Merge remote-tracking branch 'origin/master' into rails_3_1 ... Conflicts: app/models/content_instance.rb config/locales/admin_ui.de.yml public/javascripts/admin/inline_editor_toolbar.js spec/models/content_instance_spec.rb		2012-01-15 00:02:46 +10:30
..
locomotive	content_instance becomes now content_entry with its shortcut content_type.entries + change references to the old custom_fields API	2011-12-23 00:45:32 +01:00
content_instance_spec.rb	Add a failing tests for ContentInstance#set_visibility returning false.	2012-01-14 22:06:42 +10:30