Commit 9f907fd7 authored by Amrita Deb's avatar Amrita Deb
Browse files

Merge branch 'master' into 'rohlfing-docstring-argument-handling'

# Conflicts:
#   preparemoodle.py
parents 5da7d6a1 1661db24
Pipeline #457885 passed with stage
in 2 minutes and 21 seconds
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment