Merge branch 'develop' into issue/missing-private-image-src
authorHypolite Petovan <ben.lort@gmail.com>
Sat, 3 Dec 2016 15:34:48 +0000 (10:34 -0500)
committerHypolite Petovan <ben.lort@gmail.com>
Sat, 3 Dec 2016 15:34:48 +0000 (10:34 -0500)
1  2 
include/text.php

Simple merge