20504b2205
Conflicts: app/controllers/admin/page_parts_controller.rb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb |
||
---|---|---|
.. | ||
admin | ||
devise | ||
js | ||
kaminari | ||
layouts | ||
.swp |