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
..
initializers	Merge remote-tracking branch 'origin/master' into rails_3_1	2011-11-20 21:08:23 +11:00
locales	rename asset to content_asset + clean the locomotive_media plugin for tinyMCE (wip)	2011-11-19 15:47:56 +01:00
assets.yml	restore production settings + fix broken tests + apply the coding convention on the recently modified haml file	2011-07-23 01:26:16 +02:00
cucumber.yml	Ruby MRI 1.9.3 Compatability Fixes	2011-08-25 23:28:56 +02:00
routes.rb	tinymce integration (wip) + polish the jquery dialog window (wip)	2011-11-19 00:20:37 +01:00