]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a0ac51c 285c2ee)
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
authorShashi Gowda <connect2shashi@gmail.com>
Sat, 9 Apr 2011 16:27:45 +0000 (21:57 +0530)
committerShashi Gowda <connect2shashi@gmail.com>
Sat, 9 Apr 2011 16:27:45 +0000 (21:57 +0530)
commitf47027abbefe35d17df50c67eec7cd1156a5e39a
treeceb840c2ce79be3bf9263424cf35073005c10cc6tree | snapshot
parenta0ac51c22f4fd154f9f44a84ce3df79634a7b8efcommit | diff
parent285c2ee72dc254988a38d591c71efc726a8d6de4commit | diff
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Conflicts:
lib/profileblock.php
theme/default/css/display.css
EVENTS.txt diff1 | diff2 | blob | history
classes/Notice.php diff1 | diff2 | blob | history
classes/Profile.php diff1 | diff2 | blob | history
classes/User.php diff1 | diff2 | blob | history
lib/accountprofileblock.php diff1 | diff2 | blob | history
lib/default.php diff1 | diff2 | blob | history
lib/profileblock.php diff1 | diff2 | blob | history
theme/neo/css/display.css diff1 | diff2 | blob | history
theme/rebase/css/display.css 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. :-)