]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f852f7a e57bd5f)
Merge remote-tracking branch 'upstream/develop' into develop
authorMichael <heluecht@pirati.ca>
Tue, 14 Mar 2017 21:13:02 +0000 (21:13 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 14 Mar 2017 21:13:02 +0000 (21:13 +0000)

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