Merge remote-tracking branch 'origin/v2.0'
authorJeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Mon, 1 May 2017 15:24:26 +0000 (11:24 -0400)
committerJeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Mon, 1 May 2017 15:24:26 +0000 (11:24 -0400)
commita27b51d71318058e22f9a24364b4b02212738b26
tree31cd7d1dd9549e773081dea6e982d37f21c740c1
parent60d2f612c878d2ce887720107cfa7f200e2ab4d9
parent45342d2d90efa6d48fbbcbdde037fe64c4a08d6a
Merge remote-tracking branch 'origin/v2.0'