Conflicts: vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb Conflicts: vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb Conflicts: vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb |
||
|---|---|---|
| .. | ||
| assets | ||
| controllers | ||
| helpers | ||
| mailers | ||
| models | ||
| views | ||