]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - plugins/PiwikAnalytics/locale/pt_BR/LC_MESSAGES/PiwikAnalytics.po
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
authorShashi Gowda <connect2shashi@gmail.com>
Mon, 4 Apr 2011 07:56:27 +0000 (13:26 +0530)
committerShashi Gowda <connect2shashi@gmail.com>
Mon, 4 Apr 2011 07:56:27 +0000 (13:26 +0530)
commit57198a74647f8350db4de03b0b7ef157091a4359
tree680b3d31bd1b1e41f6e1f95eb4ab687445236e4a
parent5a2bab07b25443eacc7f5cfde4b9932cdb511e92
parente552993307b75abf8fbb5370c9cfcc2fa44756c2
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Conflicts:
actions/tagother.php
lib/subscriberspeopleselftagcloudsection.php
lib/subscriptionspeopleselftagcloudsection.php
15 files changed:
actions/profilesettings.php
classes/Notice.php
classes/User.php
classes/statusnet.ini
db/core.php
lib/action.php
lib/command.php
lib/personalgroupnav.php
lib/publicgroupnav.php
lib/subgroupnav.php
lib/subscriberspeopleselftagcloudsection.php
lib/subscriberspeopletagcloudsection.php
lib/subscriptionspeopleselftagcloudsection.php
lib/subscriptionspeopletagcloudsection.php
plugins/OStatus/actions/usersalmon.php