]> git.mxchange.org Git - friendica-addons.git/commitdiff
projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e48fb47 66e193c)
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Wed, 20 Feb 2013 20:49:38 +0000 (21:49 +0100)
committerMichael Vogel <icarus@dabo.de>
Wed, 20 Feb 2013 20:49:38 +0000 (21:49 +0100)
1  2 
statusnet/statusnet.php patch | diff1 | diff2 | blob | history

diff --cc statusnet/statusnet.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.