github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
engine/lib
History
Mario Visic 840609cbce Merge remote-tracking branch 'origin/master' into rails_3_1 
Conflicts:
	Gemfile
	Gemfile.lock
	app/cells/locomotive/menu_cell.rb
	app/helpers/admin/content_types_helper.rb
	app/models/content_instance.rb
	app/models/page.rb
	app/views/admin/shared/menu/_contents.html.haml
	config/initializers/locomotive.rb
	config/locales/admin_ui.de.yml
	config/locales/admin_ui.en.yml
	config/locales/admin_ui.es.yml
	config/locales/admin_ui.fr.yml
	config/locales/admin_ui.it.yml
	config/locales/admin_ui.nl.yml
	config/locales/admin_ui.no.yml
	config/locales/admin_ui.pt-BR.yml
	config/locales/admin_ui.ru.yml
	lib/generators/locomotive/install/templates/locomotive.rb
	lib/locomotive/configuration.rb
	locomotive_cms.gemspec
	spec/models/locomotive/account_spec.rb
 		2012-01-25 22:16:43 +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/master' into rails_3_1 2012-01-25 22:16:43 +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