]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 950e5f6 320059a)
Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master
authorFriendika <info@friendika.com>
Sun, 23 Jan 2011 22:19:42 +0000 (14:19 -0800)
committerFriendika <info@friendika.com>
Sun, 23 Jan 2011 22:19:42 +0000 (14:19 -0800)

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