Commit cea4be2c authored by Ales Mrazek's avatar Ales Mrazek
Browse files

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	docs/conf.py
parents 141eac9f 9d168489
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