Merge branch 'patch-1' into 'master'
authorChris Cormack <chris@bigballofwax.co.nz>
Mon, 5 Jun 2017 22:20:22 +0000 (22:20 +0000)
committerChris Cormack <chris@bigballofwax.co.nz>
Mon, 5 Jun 2017 22:20:22 +0000 (22:20 +0000)
commite442b169a940fbf09a9a56d4dfbc4633a8eed15f
tree27cff9a50edc81caa6aaa5b83efc3d06a62b471c
parent54e54dce3c5004bf6788f19a2c7fb7f165c6628b
parent8ba09abed0e13958b19275cb1062072edc1d404d
Merge branch 'patch-1' into 'master'

Update 00_intro.rst

See merge request !7