Skip to content

V
venjob

Merge branch 'master' into 'user_login' 

# Conflicts:
#   app/controllers/users_controller.rb
3 jobs from user_login
d6a7da13 d6a7da13f9c46b8b125f403b609890ab62a812da
Status Job ID Name Coverage
  Build
canceled #2711
build

 
  Test
canceled #2713
allowed to fail
codequality

canceled #2712
test