]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 1231dd7 4faf0e6)
Merge remote branch 'upstream/master'
authorHauke Zuehl <hzuehl@phone-talk.de>
Sat, 16 Jun 2012 16:04:59 +0000 (18:04 +0200)
committerHauke Zuehl <hzuehl@phone-talk.de>
Sat, 16 Jun 2012 16:04:59 +0000 (18:04 +0200)

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