From: Michael Date: Tue, 6 Jun 2017 22:20:05 +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=737e40b4d9cb363eee831074b9c560bdbbdeba79;p=friendica.git Merge branch '1706-lock' of github.com:annando/friendica into 1706-lock --- 737e40b4d9cb363eee831074b9c560bdbbdeba79