From: Michael Date: Tue, 6 Jun 2017 12:12:07 +0000 (+0000) Subject: Merge branch '1706-lock' of github.com:annando/friendica into 1706-lock X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f96423feae227e5def8b90ced82ee3405b24f068;p=friendica.git Merge branch '1706-lock' of github.com:annando/friendica into 1706-lock --- f96423feae227e5def8b90ced82ee3405b24f068