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
..
aloha/plugins/custom/locomotive_media	simple media plugin for Aloha	2012-04-22 01:14:25 +02:00
locomotive	Merge branch 'master' into wildcards	2012-05-22 20:39:30 -04:00
tinymce	add .css to dialog.scss	2012-01-28 12:59:04 +01:00
locomotive.js	path to codemirror/overlay.js has been modified in the last version of the codemirror gem	2012-02-28 06:54:02 -08:00