]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
authorShashi Gowda <connect2shashi@gmail.com>
Wed, 30 Mar 2011 10:13:13 +0000 (15:43 +0530)
committerShashi Gowda <connect2shashi@gmail.com>
Wed, 30 Mar 2011 10:17:42 +0000 (15:47 +0530)
commit5a2bab07b25443eacc7f5cfde4b9932cdb511e92
treedcc15fb4097c617cfa23d8ab2023a6b9d0317e56
parentf81aaa5375f490987aade44943880872d3f185d2
parentf213ac33db05c5595a7bc56d3d09b97f6fadd530
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Conflicts:
actions/tagother.php
classes/Profile.php
classes/Profile_tag.php
js/util.min.js
21 files changed:
actions/profilesettings.php
actions/public.php
classes/Notice.php
classes/Profile.php
classes/Profile_tag.php
classes/User.php
classes/statusnet.ini
db/core.php
js/util.js
js/util.min.js
lib/accountprofileblock.php
lib/action.php
lib/apiaction.php
lib/command.php
lib/default.php
lib/framework.php
lib/router.php
lib/subgroupnav.php
lib/util.php
plugins/OStatus/OStatusPlugin.php
theme/rebase/css/display.css