Commit a8e21f8c by Huỳnh Thiên Phước

Merge branch 'master' into 'favorite_history'

# Conflicts:
#   config/routes.rb
parents 6ccea578 f95ce8a2
Pipeline #1067 failed with stages
in 0 seconds