Commit 7e9407a5 authored by Amrita Deb's avatar Amrita Deb
Browse files

Merge branch 'master' into 'rohlfing-patch-remove-pypdf2'

# Conflicts:
#   README.md
parents 56e999e1 7130fa3f
Pipeline #459578 passed with stage
in 1 minute and 58 seconds