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)
commit857cc07252836fb9279de8c5f607c35661dda076
tree99d7c062fbeca916d29f8f220512a674362fbde1
parent96c61c2c54be1ee013eaaa71329841025248d979
parent908eccbcd1a6b310bf7dc1b55977d8ce214252b5
Merge remote-tracking branch 'origin/master'
en/source/conf.py