Commit 1fb23a64 by Ngô Trung Hưng

Merge branch 'master' into 'csv'

# Conflicts:
#   app/models/city.rb
#   config/application.rb
parents ba6efd34 c6b99ebd
Pipeline #817 canceled with stages
in 0 seconds