Merge tag 'v1.5.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 3 Feb 2017 19:12:30 +0000 (14:12 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 3 Feb 2017 19:12:30 +0000 (14:12 -0500)
Version 1.5.4

1  2 
models/block.php

Simple merge