Skip to content
Commit 06422e3e authored by Ugur Yilmaz's avatar Ugur Yilmaz
Browse files

Merge branch 'master' into 'fix-readthedocs' 

# Conflicts:
#   docs/src/conf.py
parents 5ef001ef 2f181055