]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 05dcedb 53fbd7e)
Merge remote-tracking branch 'upstream/develop' into 1704-conversation
authorMichael <heluecht@pirati.ca>
Tue, 25 Apr 2017 20:23:38 +0000 (20:23 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 25 Apr 2017 20:23:38 +0000 (20:23 +0000)

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