]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10e84c5 f28b49e)
Merge branch 'master' of https://github.com/friendica/friendica
authorThomas Willingham <founder@kakste.com>
Sun, 11 Nov 2012 15:46:04 +0000 (15:46 +0000)
committerThomas Willingham <founder@kakste.com>
Sun, 11 Nov 2012 15:46:04 +0000 (15:46 +0000)

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