Conflicts: config/locales/en.yml config/locales/zh_tw.yml vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/_profile.html.erb vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/_profile.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/_profile.html.erb |
||
|---|---|---|
| .. | ||
| devise.en.yml | ||
| devise.zh_tw.yml | ||
| en.yml | ||
| mobile.en.yml | ||
| mobile.zh_tw.yml | ||
| mongoid.zh_tw.yml | ||
| new_ui.en.yml | ||
| new_ui.zh_tw.yml | ||
| picker.en.yml | ||
| picker.zh_tw.yml | ||
| rails.zh_tw.yml | ||
| social_share_button.en.yml | ||
| social_share_button.zh-tw.yml | ||
| zh_tw.yml | ||