Merge branch 'develop' into feature/eventPageSlugAttribute
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 12 May 2017 15:23:00 +0000 (11:23 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 12 May 2017 15:23:00 +0000 (11:23 -0400)
1  2 
views/front/events/agenda.html

Simple merge