Mario Visic 5f893d51c0 Merge remote-tracking branch 'origin/master' into rails_3_1 ... Conflicts: Gemfile Gemfile.lock config/initializers/will_paginate.rb lib/locomotive/engine.rb lib/locomotive/hosting/bushido/account_ext.rb lib/locomotive/hosting/bushido/enabler.rb lib/locomotive/hosting/bushido/hooks.rb		2011-11-20 21:08:23 +11:00
..
default_constraint.rb	simply the installation screens + fix all the broken tests + add tests for bushido	2011-04-05 02:18:17 +02:00
site_dispatcher.rb	Merge remote-tracking branch 'origin/master' into rails_3_1	2011-11-20 21:08:23 +11:00