]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - classes/Group_join_queue.php
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9adbb49 0a19674)
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorBrion Vibber <brion@pobox.com>
Tue, 29 Mar 2011 23:26:20 +0000 (16:26 -0700)
committerBrion Vibber <brion@pobox.com>
Tue, 29 Mar 2011 23:26:20 +0000 (16:26 -0700)
commit674e3c2a0ef4d91f502974b34c8f58029accced7
tree07af1261cf7b89fa3c5278fc2ef676ef5cac53b7tree | snapshot
parent9adbb49fc9c134539fb8311612ccc6f67637e6d8commit | diff
parent0a19674c9f61d008069b5d9607179ea2dd7807f3commit | diff
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

Conflicts:
actions/apistatusesretweet.php
actions/repeat.php
classes/Notice.php
lib/command.php
classes/Notice.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. :-)