]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c46971 4e74866)
Merge branch '1706-lock' of github.com:annando/friendica into 1706-lock
authorMichael <heluecht@pirati.ca>
Tue, 6 Jun 2017 22:20:05 +0000 (22:20 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 6 Jun 2017 22:20:05 +0000 (22:20 +0000)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.