]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d9f677 4e913d5)
Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master
authorFriendika <info@friendika.com>
Sat, 5 Feb 2011 20:59:04 +0000 (12:59 -0800)
committerFriendika <info@friendika.com>
Sat, 5 Feb 2011 20:59:04 +0000 (12:59 -0800)

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