]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa358b7 21536fc)
Merge remote branch 'mike/master'
authorOlivier Migeot <olivier@migeot.org>
Wed, 13 Apr 2011 12:25:13 +0000 (14:25 +0200)
committerOlivier Migeot <olivier@migeot.org>
Wed, 13 Apr 2011 12:25:13 +0000 (14:25 +0200)

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