60826ceedc
Conflicts: app/assets/javascripts/application.js |
||
---|---|---|
.. | ||
_form.html.haml | ||
create.js.erb | ||
new.js.erb | ||
update.js.erb |
60826ceedc
Conflicts: app/assets/javascripts/application.js |
||
---|---|---|
.. | ||
_form.html.haml | ||
create.js.erb | ||
new.js.erb | ||
update.js.erb |