Conflicts: config/locales/en.yml config/locales/zh_tw.yml vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb |
||
|---|---|---|
| .. | ||
| app_auth_basic.rb | ||
| app_auth_spec.rb | ||
| attribute_field_spec.rb | ||
| attribute_value_spec.rb | ||
| preview_spec.rb | ||
| role_spec.rb | ||