Merge tag 'v1.0.0' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Jun 2017 12:40:12 +0000 (08:40 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Jun 2017 12:40:12 +0000 (08:40 -0400)
commit86766b0bed3f04e2ad2f710ed95d067767c5d69a
treeb6f00763b12debfc4efb078492c8723069f8fe28
parent997482dc14c5834ecbac0d3020e16a7e9b004b33
parent2c3a9738c95922e6d6adba1056a992fb4f9470c5
Merge tag 'v1.0.0' into develop

rolling develop changes into master after testing file upload on dev55