]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd965b0 c30306e)
Merge remote-tracking branch 'upstream/develop' into 1604-salmon-like
authorMichael Vogel <icarus@dabo.de>
Sat, 2 Apr 2016 12:12:02 +0000 (14:12 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 2 Apr 2016 12:12:02 +0000 (14:12 +0200)

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