engine/app/assets/stylesheets
Marko Iskander 02ea6913e3 Merge branch 'master' into wildcards
Conflicts:
	Gemfile.lock
	app/assets/javascripts/locomotive/models/page.js.coffee
	app/assets/javascripts/locomotive/views/pages/_form_view.js.coffee
	app/models/locomotive/extensions/site/locales.rb
	app/models/locomotive/page.rb
	app/views/locomotive/pages/_form.html.haml
	config/initializers/haml.rb
	config/locales/default.ru.yml
	config/locales/formtastic.ru.yml
	doc/TODO
	lib/locomotive/haml.rb
	script/upgrade_v1.rb
	spec/dummy/config/initializers/haml.rb
2012-05-22 20:39:30 -04:00
..
locomotive Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
.gitkeep upgrade to new gems + remove hosting modules + change settings for Rails 3.1 + move assets to app/assets 2011-10-30 13:17:05 +01:00
locomotive.css remove the import/export functionalities (replaced by the API and the new locomotive editor) + upgrade gems (codemirror, ...etc) 2012-01-28 12:41:00 +01:00