Merge tag 'v1.2.10' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 18 May 2017 17:15:03 +0000 (13:15 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 18 May 2017 17:15:03 +0000 (13:15 -0400)
commit82856327066f6b8a119b2f000dcf5235b5573051
tree1ab89c6bb8f8b755a82855cca2d4acbdddad74b1
parentd49bed687292d9edb80edc722ffde95ee4fed3af
parent2c247f8f366ecd0c9d7af8a0ac5c0ed213d613ef
Merge tag 'v1.2.10' into develop

changing live cam link, adding new summer web cam logo, changing winter activies to summer fun