02ea6913e3
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 |
||
---|---|---|
.. | ||
account_presenter.rb | ||
base_presenter.rb | ||
content_asset_presenter.rb | ||
content_entry_presenter.rb | ||
content_type_presenter.rb | ||
editable_control_presenter.rb | ||
editable_element_presenter.rb | ||
editable_file_presenter.rb | ||
editable_long_text_presenter.rb | ||
editable_short_text_presenter.rb | ||
membership_presenter.rb | ||
page_presenter.rb | ||
site_presenter.rb | ||
snippet_presenter.rb | ||
theme_asset_presenter.rb |