https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f1efcc 645c2f9)
Merge https://github.com/friendica/friendica into pull
authorfriendica <info@friendica.com>
Tue, 12 Jun 2012 08:02:05 +0000 (01:02 -0700)
committerfriendica <info@friendica.com>
Tue, 12 Jun 2012 08:02:05 +0000 (01:02 -0700)

Trivial merge
mirror https://github.com/friendica/friendica.git