Merge branch 'hotfix/1.2.3' v1.2.3
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 18:11:03 +0000 (13:11 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 18:11:03 +0000 (13:11 -0500)
commit21850c489ebf01e8864eaace4bfe31db4126385e
tree946f50df565eefe180e4b728bc0127728beb8f9b
parent1446b003b7f68ed75de64d19b17685808b125ef0
parent70132146da96f2725e9f7947df172eb7ee2246cf
Merge branch 'hotfix/1.2.3'