Merge tag 'v1.1.6' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 20 Sep 2016 14:06:21 +0000 (10:06 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 20 Sep 2016 14:06:21 +0000 (10:06 -0400)
commitd3d154bf7857040c0f760e75998d07db1c657ae9
treef32bc80790f68673cf035e837e7512291dfb9a4a
parentd47a32de4f0ff72c026db308471169e8a0d17bda
parent96c0b92dc8871e55bc140090b683abfe995a47c2
Merge tag 'v1.1.6' into develop

adding id to glm events wrapper button so that the calendar buttons aren't affected