Commit 5c31e055 by Tô Ngọc Ánh

Merge branch 'master' into 'id2-id3'

# Conflicts:
#   app/views/home/index.html.erb
parents 7a3fadae 4e70cfdf
Pipeline #764 canceled with stages
in 0 seconds