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

Merge branch 'master' into 'favorite_history'

# Conflicts:
#   config/routes.rb
parents d91084a9 f95ce8a2
Pipeline #1061 failed with stages
in 0 seconds