]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6dfaa5a fa7f0ca)
Merge remote-tracking branch 'upstream/develop' into 1611-parseurl
authorMichael <heluecht@pirati.ca>
Sun, 13 Nov 2016 19:12:11 +0000 (19:12 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 13 Nov 2016 19:12:11 +0000 (19:12 +0000)

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