Skip to content

V
venjob
Commit 20b078ef by Huỳnh Thiên Phước
Options

Merge branch 'master' into 'user_login' 

# Conflicts:
#   app/controllers/users_controller.rb
parents 4a1c68f8 069f8180
Pipeline #933 canceled with stages
in 0 seconds