Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 4 May 2018 16:57:06 +0000 (12:57 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 4 May 2018 16:57:06 +0000 (12:57 -0400)
commitcaa4c8a7f39a1ce7a139e34e6c3eb628512e615d
tree74536eb1bf8bbe78ead6cfda9077e0ee1b4a3f8f
parent2be8b96bee072522c3f5e809a380fc50694fd284
parentdf46ee6a3b2f1f09d305975aa2aec18491a2a8b6
Merge branch 'hotfix/1.0.4'