Skip to content

V
venjob

Merge branch 'master' into 'user_login' 

# Conflicts:
#   app/controllers/users_controller.rb
3 jobs from user_login
98f21089 98f210893b78c0e6554feba3d9db65d1d0a8e7d4
Status Job ID Name Coverage
  Build
canceled #2690
build

 
  Test
canceled #2692
allowed to fail
codequality

canceled #2691
test