Commit bf3fb966 authored by Jacek Lebioda's avatar Jacek Lebioda
Browse files

Merge branch 'master' into 'develop'

# Conflicts:
#   Gemfile
parents 81ebfe4c aac9f4ac
Pipeline #32894 passed with stage
in 4 minutes and 19 seconds