https://reisub.nsupdate.info/git / friendica-addons.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09bb2d5 13a7ae3)
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Thu, 16 May 2013 22:01:02 +0000 (00:01 +0200)
committerMichael Vogel <icarus@dabo.de>
Thu, 16 May 2013 22:01:02 +0000 (00:01 +0200)
1  2 
statusnet/statusnet.php patch | diff1 | diff2 | blob | history

diff --cc statusnet/statusnet.php
Simple merge
mirror https://github.com/friendica/friendica-addons.git