]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 774ee9c 6109c66)
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 21 Dec 2014 09:58:43 +0000 (10:58 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 21 Dec 2014 09:58:43 +0000 (10:58 +0100)

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