1 commit
Conflicts: app/controllers/public/chat_controller.rb Conflicts: app/controllers/public/chat_controller.rb