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)
1  2 
views/front/events/agenda.html

Simple merge