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)
commit5dc3d78b84c42ec85d25be751b52145e17cb1a25
treed68aa7eac3fb9c5f46d571f1eac8241e4dfffd51
parent2e5ead4700a67895c4e405da962162994682e164
parent2ad9dcaed9a71f51ff487e486e36176feea0828f
Merge branch 'develop' into feature/categorySlug
models/front/events/list.php