Merge tag 'v1.6.31' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Apr 2017 18:16:50 +0000 (14:16 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Apr 2017 18:16:50 +0000 (14:16 -0400)
Version 1.6.31

1  2 
models/admin/events/list.php

Simple merge