Merge tag 'v1.2.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:52:09 +0000 (12:52 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:52:09 +0000 (12:52 -0400)
commit5822537bac305229b2662bb9d7f26406b31db672
treecff35bd6f8503d8a5b1a1730db7c09a483b48eb3
parent0393223a795be0d7d3789251aea52f9ee2272e59
parentaf0e674833e4ecd1b90205212df362045d78f339
Merge tag 'v1.2.1' into develop

v1.2.1