Merge branch 'hotfix/1.2.0' v1.2.0
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:58:59 +0000 (09:58 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:58:59 +0000 (09:58 -0400)
commiteac2f6c211fc7ebe3a692723c54c10fb279f8977
tree2777ea1a2eedd2ab7c975b0fdb1f7527e705f1f4
parent1313b30cb81ff6ea6ea0e848dd2ceb24b4126154
parent36fbc3e79951f8aa859aa20c80ab12faa59620cf
Merge branch 'hotfix/1.2.0'