]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 994c37b 054f8ed)
Merge branch 'master' of http://github.com/friendica/friendica
authorpixelroot <info@pixelbits.de>
Mon, 24 Sep 2012 06:46:25 +0000 (08:46 +0200)
committerpixelroot <info@pixelbits.de>
Mon, 24 Sep 2012 06:46:25 +0000 (08:46 +0200)

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