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 |
||
|---|---|---|
| .. | ||
| environments | ||
| initializers | ||
| locales | ||
| application.rb | ||
| boot.rb | ||
| config.yml | ||
| database.yml.example | ||
| environment.rb | ||
| ldap.yml | ||
| list.yml | ||
| mongoid.yml | ||
| resque.god | ||
| resque_schedule.god | ||
| resque_schedule.yml | ||
| routes.rb | ||
| sunspot.yml | ||