088cd54b1d
Conflicts: config/locales/zh_tw.yml |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
application.rb | ||
boot.rb | ||
config.yml | ||
database.yml.example | ||
environment.rb | ||
list.yml | ||
mongoid.yml | ||
routes.rb |