]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b49a36f a58f9b3)
Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach
authorMichael <heluecht@pirati.ca>
Sat, 15 Jul 2017 10:36:56 +0000 (10:36 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 15 Jul 2017 10:36:56 +0000 (10:36 +0000)

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