]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0541a62 bee6ad5)
Merge remote-tracking branch 'upstream/develop' into acl-speedup
authorMichael <heluecht@pirati.ca>
Thu, 8 Jun 2017 04:01:55 +0000 (04:01 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 8 Jun 2017 04:01:55 +0000 (04:01 +0000)

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