]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b3b97d 5a5aadb)
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Tue, 20 Mar 2012 07:08:42 +0000 (08:08 +0100)
committerzottel <github@zottel.net>
Tue, 20 Mar 2012 07:08:42 +0000 (08:08 +0100)

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