Flarum 2.x#150

achton wants to merge 2 commits into

crazy-max:mastercrazy-max/docker-flarum:masterfrom

achton:flarum-2.xachton/docker-flarum:flarum-2.xCopy head branch name to clipboard