engine/config/initializers
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
..
carrierwave.rb namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
devise.rb use the last version of formtastic + tweak the css for formtastic with scss + compass (wip) + clean code (wip) 2011-11-09 02:35:59 +01:00
dragonfly.rb namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
formtastic.rb namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
haml.rb namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
inflections.rb namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
locomotive.rb namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
mime_types.rb first init 2010-03-30 00:01:47 +02:00
rspec_generator.rb namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
secret_token.rb namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00