Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/vcl into develop
Project: http://git-wip-us.apache.org/repos/asf/vcl/repo Commit: http://git-wip-us.apache.org/repos/asf/vcl/commit/15b187fb Tree: http://git-wip-us.apache.org/repos/asf/vcl/tree/15b187fb Diff: http://git-wip-us.apache.org/repos/asf/vcl/diff/15b187fb Branch: refs/heads/develop Commit: 15b187fb6bf03608756e4daec00c6ed581005a4e Parents: 932d572 4e9e37c Author: Josh Thompson <[email protected]> Authored: Thu Jun 21 12:26:33 2018 -0400 Committer: Josh Thompson <[email protected]> Committed: Thu Jun 21 12:26:33 2018 -0400 ---------------------------------------------------------------------- web/.ht-inc/blockallocations.php | 9 ++++----- web/.ht-inc/vm.php | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
