088cd54b1d
Conflicts: config/locales/zh_tw.yml |
||
---|---|---|
.. | ||
devise.en.yml | ||
devise.zh_tw.yml | ||
en.yml | ||
rails.yml | ||
zh_tw.yml |
088cd54b1d
Conflicts: config/locales/zh_tw.yml |
||
---|---|---|
.. | ||
devise.en.yml | ||
devise.zh_tw.yml | ||
en.yml | ||
rails.yml | ||
zh_tw.yml |