Merge branch 'feature/Canonical' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 14 Oct 2015 20:14:52 +0000 (16:14 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 14 Oct 2015 20:14:52 +0000 (16:14 -0400)
commit06429bf645c8f48f00c81fdfc9f3a245326bdd73
tree455da4cea44bd1652e7d83297bdc598e2443acbd
parent0d03a033a525fbfa6da9e922cd4e52e4d265476c
parenta9c99b2e912699a0a945ac695aff4d27b7f632ea
Merge branch 'feature/Canonical' into develop