]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit138ca38b6f39eb01d4b84030d634796077ade7d4
treeb987542dd597584f735ea5e89cc8d2b6c76782aatree | snapshot
parent997b0933ea7f5da8fafe61c0954a88b2a05c6703commit | diff
parentbc66211565035ed5986390fdecd089cbbb8db959commit | diff
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x

Conflicts:
plugins/EmailRegistration/emailregister.php
plugins/EmailRegistration/emailregister.php 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. :-)