]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42d1474 8ed085c)
Merge commit 'mike/master'
authorolivierm <olivier@migeot.org>
Thu, 24 Feb 2011 17:52:08 +0000 (18:52 +0100)
committerolivierm <olivier@migeot.org>
Thu, 24 Feb 2011 17:52:08 +0000 (18:52 +0100)

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