]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1457d6e 845b123)
Merge remote-tracking branch 'upstream/master'
authorThomas Willingham <founder@kakste.com>
Mon, 2 Apr 2012 00:27:23 +0000 (01:27 +0100)
committerThomas Willingham <founder@kakste.com>
Mon, 2 Apr 2012 00:27:23 +0000 (01:27 +0100)

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