Mario Visic 5c191e59cd Merge remote-tracking branch 'origin/2.0.0.rc' into 2.0.0.rc ... Conflicts: Gemfile.lock		2012-01-25 22:20:05 +11:00
..
generators/locomotive/install	Merge remote-tracking branch 'origin/master' into rails_3_1	2012-01-25 22:16:43 +11:00
locomotive	Merge remote-tracking branch 'origin/2.0.0.rc' into 2.0.0.rc	2012-01-25 22:20:05 +11:00
tasks	Merge remote-tracking branch 'origin/master' into rails_3_1	2012-01-25 22:16:43 +11:00
locomotive.rb	trying to make it work with the precompilation of assets (issue with Aloha and TinyMCE)	2012-01-20 14:46:09 +01:00