Merge branch 'develop' into rewrites/coding-convention-split2
authorHypolite Petovan <mrpetovan@gmail.com>
Mon, 3 Apr 2017 10:35:27 +0000 (06:35 -0400)
committerGitHub <noreply@github.com>
Mon, 3 Apr 2017 10:35:27 +0000 (06:35 -0400)
1  2 
boot.php

diff --cc boot.php
Simple merge