]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2543f9 98c5eb1)
Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes
authorMichael <heluecht@pirati.ca>
Sat, 7 Jan 2017 14:31:25 +0000 (14:31 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 7 Jan 2017 14:31:25 +0000 (14:31 +0000)

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