Merge branch 'hotfix/1.2.7' v1.2.7
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Feb 2017 20:14:08 +0000 (15:14 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Feb 2017 20:14:08 +0000 (15:14 -0500)
commite90c07e3c141f06dc91abe9efec756a1cfa297ad
treeae76f7cec6c8cf98a043ccf987b8800dc522fbf5
parente7c0454cd7cd894b669833aa273b02f215b12072
parent6fa8be21508faeb75949f54affa6299972971c21
Merge branch 'hotfix/1.2.7'