]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7d0d89d 1652ded)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Mon, 4 Oct 2010 18:42:16 +0000 (11:42 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 4 Oct 2010 18:42:16 +0000 (11:42 -0700)
commit5b49366f49b77fd677f415facb75c9b21c10b5d3
treeb38bb4dc936d77a07d51f67e0eacc63c2d6239e2tree | snapshot
parent7d0d89ddea7ae21f7c1526c170a20aa865d7c376commit | diff
parent1652ded48c9c62c40157a5142e5231adbc574ddbcommit | diff
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
plugins/AnonymousFave/AnonymousFavePlugin.php
plugins/AnonymousFave/AnonymousFavePlugin.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. :-)