]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c0b550 bf28cc0)
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 5 Apr 2015 18:30:38 +0000 (20:30 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 5 Apr 2015 18:30:38 +0000 (20:30 +0200)

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