]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb59f10 e1eb923)
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
authorMichael <heluecht@pirati.ca>
Mon, 13 Mar 2017 14:10:28 +0000 (14:10 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 13 Mar 2017 14:10:28 +0000 (14:10 +0000)

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