]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b8f3a4 290da6c)
Merge branch 'master' of https://github.com/friendica/friendica
authorThomas Willingham <founder@kakste.com>
Thu, 13 Sep 2012 19:52:06 +0000 (20:52 +0100)
committerThomas Willingham <founder@kakste.com>
Thu, 13 Sep 2012 19:52:06 +0000 (20:52 +0100)

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