]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84b733e 5eaa595)
Merge remote-tracking branch 'upstream/develop' into 1701-top-level
authorMichael <heluecht@pirati.ca>
Wed, 11 Jan 2017 23:15:23 +0000 (23:15 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 11 Jan 2017 23:15:23 +0000 (23:15 +0000)

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