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)
commit8a0db72368862eb3de5829873a9cf1fac16065da
tree22f49673329683444c87cd473d14094fd4a5a7ec
parent2a51e8d7518478c96d869c81874bcabac27c1427
parentf0439f9f4e7ede806f3cdb2ee98520b75aa87ef0
Merge tag 'v1.5.4' into develop

Version 1.5.4
models/block.php