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