Merge branch 'hotfix/1.2.4' 1.2.4
authorIan Weller <ian@gaslightmedia.com>
Tue, 17 Jan 2017 19:57:56 +0000 (14:57 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 17 Jan 2017 19:57:56 +0000 (14:57 -0500)
commit4434bf87b1e3ff13d240d7e287d157d489ff472a
tree8b8b657685b4ec103b3509f65bbc55988f4450c7
parent2ae7c3a6b6588e3e3b87357ce97e99c506a57ba3
parentfc18c20810598dcc62fb39334daedcf711805569
Merge branch 'hotfix/1.2.4'