]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66996a2 b69f6b6)
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Tue, 29 Apr 2014 10:36:49 +0000 (12:36 +0200)
committerMichael Vogel <icarus@dabo.de>
Tue, 29 Apr 2014 10:36:49 +0000 (12:36 +0200)

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