c3cf32e863
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/admin/application_settings_controller.rb app/views/admin/application_settings/_form.html.haml db/schema.rb |
||
---|---|---|
.. | ||
_shortcuts.html.haml | ||
index.html.haml | ||
shortcuts.js.haml | ||
show.html.haml | ||
ui.html.haml |