Merge branch 'develop' into feature/beerweek feature/beerweek
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 28 Oct 2016 18:26:22 +0000 (14:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 28 Oct 2016 18:26:22 +0000 (14:26 -0400)
1  2 
models/front/events/list.php

Simple merge