projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ce5bce 1d35d1e)
Merge branch 'pull'
authorFriendika <info@friendika.com>
Wed, 20 Jul 2011 00:25:13 +0000 (17:25 -0700)
committerFriendika <info@friendika.com>
Wed, 20 Jul 2011 00:25:13 +0000 (17:25 -0700)

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