github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
75b0137230
engine/spec/cells/locomotive
History
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
..
global_actions_spec.rb Merge remote-tracking branch 'origin/master' into rails_3_1 2012-01-14 16:37:24 +10:30
main_menu_cell_spec.rb Lots of spec fixes (mostly namespacing), down to 107 failing specs. 2011-11-26 17:24:34 +11:00
settings_menu_cell_spec.rb Lots of spec fixes (mostly namespacing), down to 107 failing specs. 2011-11-26 17:24:34 +11:00