Skip to content

V
venjob

Merge branch 'master' into 'user_login' 

# Conflicts:
#   app/controllers/users_controller.rb
3 jobs from user_login
20b078ef 20b078eff13d4066ba20f47a77869ca19f606982
Status Job ID Name Coverage
  Build
canceled #2720
build

 
  Test
canceled #2722
allowed to fail
codequality

canceled #2721
test