Commit 0b319ea9 by Ngô Trung Hưng

Merge branch 'master' into 'crawler'

# Conflicts:
#   app/assets/javascripts/custom.js
#   app/models/city.rb
parents 3c7e899c 2e9845a6
Pipeline #792 canceled with stages
in 0 seconds