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)
commitbda76c11cfacd6a70fa3857ec881ce0f11b7a612
treeecfe6239e4968ce13aebd3cbda5100b5a9a6bf54
parent61e6b41dc8713d6909fdcdf80c343958bb8501a4
parent42422490f322915a025628177355259619e19f90
Merge branch 'develop' into feature/beerweek
models/front/events/list.php