00035287c3
Conflicts: config/locales/admin_ui.de.yml config/locales/formtastic.de.yml |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
application.rb | ||
assets.yml | ||
boot.rb | ||
bushido.json | ||
cucumber.yml | ||
environment.rb | ||
mongoid.yml | ||
routes.rb |