Merge remote-tracking branch 'origin/master'
authorChris Cormack <chris@bigballofwax.co.nz>
Sun, 11 Dec 2016 03:28:55 +0000 (16:28 +1300)
committerChris Cormack <chris@bigballofwax.co.nz>
Sun, 11 Dec 2016 03:28:55 +0000 (16:28 +1300)
1  2 
en/source/conf.py

Simple merge