]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 710b7f6 9f91cc0)
Merge commit 'refs/merge-requests/199' of git://gitorious.org/statusnet/mainline...
authorMikael Nordfeldth <mmn@hethane.se>
Mon, 31 Mar 2014 11:09:11 +0000 (13:09 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Mon, 31 Mar 2014 11:09:11 +0000 (13:09 +0200)
1  2 
plugins/QnA/QnAPlugin.php patch | diff1 | diff2 | blob | history

diff --cc plugins/QnA/QnAPlugin.php
Simple merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)