Merge branch 'hotfix/1.1.4' v1.1.4
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Aug 2016 15:24:54 +0000 (11:24 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Aug 2016 15:24:54 +0000 (11:24 -0400)
commit502ee76ced8687804af73b77af4c51be1189d688
tree8b4b59173701faf0ea1b6eca6f277b8bc149ab52
parent16b49e3b573d47a5c9b137bc6c8b8b921d457e28
parent93a917549f29e0e1ed05f8a58418519fe19d8bd9
Merge branch 'hotfix/1.1.4'