Commit 0b6c3974 authored by Tugce Nur Tas's avatar Tugce Nur Tas

Merge branch 'master' into 'develop'

# Conflicts:
#   app/controllers/concerns/pdf_helpers.rb
#   app/views/layouts/pdf_layout.pdf.slim
#   config/locales/de.yml
#   db/schema.rb
parents dd9e8ec6 9f9f23a8
Pipeline #64407 passed with stage
in 49 minutes and 48 seconds