Mario Visic 75b0137230 Merge remote-tracking branch 'origin/master' into rails_3_1 ... Conflicts: Gemfile Gemfile.lock features/support/env.rb locomotive_cms.gemspec spec/cells/locomotive/global_actions_spec.rb spec/cells/locomotive/main_menu_cell_spec.rb spec/cells/locomotive/settings_menu_cell_spec.rb		2012-01-14 16:37:24 +10:30
..
page_spec.rb	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
site_spec.rb	Ruby MRI 1.9.3 Compatability Fixes	2011-08-25 23:28:56 +02:00