6c0de3dc74
Conflicts: config/locales/de.yml config/locales/en.yml |
||
---|---|---|
.. | ||
_edit.html.haml | ||
_new.html.haml | ||
create.js.erb | ||
destroy.js.haml | ||
edit.js.haml | ||
new.js.haml | ||
update.js.erb |
6c0de3dc74
Conflicts: config/locales/de.yml config/locales/en.yml |
||
---|---|---|
.. | ||
_edit.html.haml | ||
_new.html.haml | ||
create.js.erb | ||
destroy.js.haml | ||
edit.js.haml | ||
new.js.haml | ||
update.js.erb |