]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6621de6 254c318)
Merge remote-tracking branch 'upstream/master'
authorThomas Willingham <founder@kakste.com>
Sun, 4 Nov 2012 19:56:33 +0000 (19:56 +0000)
committerThomas Willingham <founder@kakste.com>
Sun, 4 Nov 2012 19:56:33 +0000 (19:56 +0000)

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