]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a01dd4d ca21f1b)
Merge branch 'master' of https://github.com/friendica/friendica
authorThomas Willingham <founder@kakste.com>
Fri, 12 Oct 2012 20:35:32 +0000 (21:35 +0100)
committerThomas Willingham <founder@kakste.com>
Fri, 12 Oct 2012 20:35:32 +0000 (21:35 +0100)

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