Commit 011ac89c by thanhnd

Merge branch 'master' into 'user_pages'

# Conflicts:
#   Gemfile
#   config/routes.rb
#   config/setting.yml
parents 4374085f 6a010474
Pipeline #562 failed with stages
in 0 seconds