Merge branch 'develop' into feature/calendarNavigation
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 12 May 2017 14:24:57 +0000 (10:24 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 12 May 2017 14:24:57 +0000 (10:24 -0400)
commita8f69dc6d0520b0e9d68cb293a7178e4dcc8413f
tree38005d6580b9151aa7f6ef0d87cc1486df8528c4
parent80e62edbcdb7cd1b9bc14926d168bc3343b80f0c
parentc306acc0693f7a44493d569a29e67113a5e76580
Merge branch 'develop' into feature/calendarNavigation
views/front/events/agenda.html