]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4d1416 e2e38fc)
Merge remote-tracking branch 'upstream/develop' into bbcode-url-detection
authorMichael <heluecht@pirati.ca>
Mon, 22 Jan 2018 22:22:16 +0000 (22:22 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 22 Jan 2018 22:22:16 +0000 (22:22 +0000)

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