Merge branch 'release/1.2.4' v1.2.4
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Dec 2016 14:45:06 +0000 (09:45 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Dec 2016 14:45:06 +0000 (09:45 -0500)
commit45047cfd832842ed96007898f190ab7fc608a01b
tree062d52130fd9f8dbedce713040fb4aa9ee572213
parentaee29cf74459dad449c016a9bb88a978e607ab0c
parent8c2dfe6cc062864f028da6457aa06ec092fc35b7
Merge branch 'release/1.2.4'