Merge branch 'feature/fixTravis' into develop
commitd08d98f6a801d3e670b57b4fae4186c50eff2105
authorThomas Harning Jr <harningt@gmail.com>
Thu, 1 Nov 2018 21:13:20 +0000 (1 17:13 -0400)
committerThomas Harning Jr <harningt@gmail.com>
Thu, 1 Nov 2018 21:13:20 +0000 (1 17:13 -0400)
tree21f5123139ce4f45711571ca5ee5a60311387850
parent17ea30e4686357762896c6556588e2037356cbb2
parent447258dea52cff3f58bc3aabab5e3b8e01f05e50
Merge branch 'feature/fixTravis' into develop