]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8786bcd 366ccdb)
Merge remote-tracking branch 'upstream/develop' into 1704-duplicate-feed
authorMichael <heluecht@pirati.ca>
Sat, 8 Apr 2017 10:05:01 +0000 (10:05 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 8 Apr 2017 10:05:01 +0000 (10:05 +0000)

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