projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 181a17b 9953e6d)
Merge https://github.com/friendica/friendica into pull
authorfriendica <info@friendica.com>
Fri, 22 Jun 2012 22:27:54 +0000 (15:27 -0700)
committerfriendica <info@friendica.com>
Fri, 22 Jun 2012 22:27:54 +0000 (15:27 -0700)

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