]> 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: 31c1177 61960d3)
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
authorShashi Gowda <connect2shashi@gmail.com>
Tue, 22 Mar 2011 02:29:06 +0000 (07:59 +0530)
committerShashi Gowda <connect2shashi@gmail.com>
Tue, 22 Mar 2011 02:29:06 +0000 (07:59 +0530)
commitbf121a695a13c2b30abf57ea86afbe1e6c2420a7
tree8248442b24cdf76335245d0489894cb2c055e358tree | snapshot
parent31c1177970124cee31823cab3a11542c23b4126dcommit | diff
parent61960d36687cba7b4ace801fdd65829314bc0a13commit | diff
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Conflicts:
classes/Profile.php
EVENTS.txt diff1 | diff2 | blob | history
classes/Profile.php diff1 | diff2 | blob | history
classes/User.php diff1 | diff2 | blob | history
classes/statusnet.ini diff1 | diff2 | blob | history
db/core.php diff1 | diff2 | blob | history
lib/command.php diff1 | diff2 | blob | history
lib/router.php diff1 | diff2 | blob | history
plugins/OStatus/OStatusPlugin.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. :-)