]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea18d18 6ff0cfb)
Merge remote-tracking branch 'upstream/develop' into 1701-index-again
authorMichael <heluecht@pirati.ca>
Tue, 24 Jan 2017 06:48:05 +0000 (06:48 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 24 Jan 2017 06:48:05 +0000 (06:48 +0000)

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