]> 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: 997b093 bc66211)
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Tue, 19 Apr 2011 00:19:25 +0000 (20:19 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 19 Apr 2011 00:19:25 +0000 (20:19 -0400)
Conflicts:
plugins/EmailRegistration/emailregister.php

1  2 
plugins/EmailRegistration/emailregister.php patch | diff1 | diff2 | blob | history

This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)