]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 531201f 6dbee45)
Merge https://github.com/friendica/friendica into pull
authorfriendica <info@friendica.com>
Thu, 15 Mar 2012 08:48:07 +0000 (01:48 -0700)
committerfriendica <info@friendica.com>
Thu, 15 Mar 2012 08:48:07 +0000 (01:48 -0700)

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