Merge branch 'develop' into feature/categorySlug feature/categorySlug
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 7 Feb 2017 16:47:50 +0000 (11:47 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 7 Feb 2017 16:47:50 +0000 (11:47 -0500)
1  2 
models/front/events/list.php

Simple merge