Merge tag 'v1.2.0' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:59:06 +0000 (09:59 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:59:06 +0000 (09:59 -0400)
commit23a74d955f5c5e796ec9b95650d61374f0d28015
tree2777ea1a2eedd2ab7c975b0fdb1f7527e705f1f4
parente6ec7592386d8d6e955dc160fe7956248603424f
parenteac2f6c211fc7ebe3a692723c54c10fb279f8977
Merge tag 'v1.2.0' into develop

v1.2.0