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
..
generators/locomotive/install	add the ui element to select the languages for a site	2012-01-09 17:24:34 -08:00
locomotive	Merge remote-tracking branch 'origin/master' into rails_3_1	2012-01-14 16:37:24 +10:30
tasks	rename asset to content_asset + clean the locomotive_media plugin for tinyMCE (wip)	2011-11-19 15:47:56 +01:00
locomotive.rb	refactor and clean code (wip) + the api controller has been deleted and replace by the entry_submission_controller (+ custom responder)	2012-01-09 06:49:59 -08:00