Merge tag 'v1.2.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 13 Sep 2016 16:52:19 +0000 (12:52 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 13 Sep 2016 16:52:19 +0000 (12:52 -0400)
commit5f47c34d18d29541c243eda9503d3448f0d6e5b9
tree8a86a61d0dffd8ad2d0fec458c920d8ca8a99af4
parent627f56132a0fffe3e8bfec64cd314b15a01bac7c
parentd3e77a4731775f86fdf0e9881ad4c8b5a02c91de
Merge tag 'v1.2.6' into develop

v1.2.6