Merge branch 'master'v1.0-rc1
commit6fb02d00564025f8368382af02fbcb90d830de5c
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 12 Feb 2018 18:53:11 +0000 (12 13:53 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 12 Feb 2018 18:53:11 +0000 (12 13:53 -0500)
tree90fde0e3ee6435903cb879039d923536ea737618
parentbb5f8faefadd3b006878c4d3bea28b9e6fc90fa6
parentbe92ed6cbafb6381a5697259246a738e853beb88
Merge branch 'master'