]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3116db1 9434b44)
Merge branch 'master' of git://github.com/friendica/friendica
authorTobias Hößl <tobias@hoessl.eu>
Sun, 22 Apr 2012 13:31:07 +0000 (13:31 +0000)
committerTobias Hößl <tobias@hoessl.eu>
Sun, 22 Apr 2012 13:31:07 +0000 (13:31 +0000)

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