Merge tag 'v1.0.6' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 28 Apr 2017 13:58:13 +0000 (09:58 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 28 Apr 2017 13:58:13 +0000 (09:58 -0400)
commit0a92bd1acb20f93913b5ec68919dc51be55e712b
treee2139b83b5bf7115b717e0c64788fa729d6082a0
parenta509ede2eda8f4a8d953dbee08938c26ea12c2be
parent0f92954726514144f1fe4d5c03617a4ac2eae527
Merge tag 'v1.0.6' into develop

release for tickets dropdown conflict fix, changing ids in dropdown form