Merge branch '1706-lock' of github.com:annando/friendica into 1706-lock

This commit is contained in:
Michael 2017-06-06 22:20:05 +00:00
commit 737e40b4d9