]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 6ae5962 b86a081)
Merge remote-tracking branch 'upstream/master'
authorThomas <rat@rlyeh-military-affairs>
Fri, 9 Mar 2012 01:50:51 +0000 (01:50 +0000)
committerThomas <rat@rlyeh-military-affairs>
Fri, 9 Mar 2012 01:50:51 +0000 (01:50 +0000)

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