]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7e3b29 5d20bba)
Merge remote-tracking branch 'upstream/develop' into item-permissions
authorMichael <heluecht@pirati.ca>
Sat, 20 Jan 2018 10:17:04 +0000 (10:17 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 20 Jan 2018 10:17:04 +0000 (10:17 +0000)

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