]> 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: 59043dc 4bf5158)
Merge commit 'refs/merge-requests/159' of git://gitorious.org/statusnet/mainline...
authorEvan Prodromou <evan@status.net>
Wed, 21 Sep 2011 20:31:38 +0000 (16:31 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 21 Sep 2011 20:31:38 +0000 (16:31 -0400)
1  2 
actions/login.php patch | diff1 | diff2 | blob | history

diff --cc actions/login.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. :-)