Conflicts: .gitignore Gemfile app/views/issues/index.html.erb app/views/layouts/_base_feedback.html.erb app/views/tags/_tag_name.html.erb config/environments/production.rb db/schema.rb Signed-off-by: alan <547533434@qq.com>