Merge branch 'develop' into feature/calendarNavigation
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 12 May 2017 17:08:14 +0000 (13:08 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 12 May 2017 17:08:14 +0000 (13:08 -0400)
commitac133abb7946aba6caa3e5572442089564d982d5
tree4ebd7dc3cb5855408105db2fa60c163c51f0cef9
parent19539b9a2b4b9b3e6f85a69b8d958705889a06fd
parentab64fc0f3dcdfc5322d9b4e6ccd8f48f102ec49a
Merge branch 'develop' into feature/calendarNavigation
models/front/events/list.php
views/front/events/agenda.html