]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po
Merge branch '1.0.x' into people_tags_rebase
authorShashi Gowda <connect2shashi@gmail.com>
Tue, 22 Mar 2011 02:26:25 +0000 (07:56 +0530)
committerShashi Gowda <connect2shashi@gmail.com>
Tue, 22 Mar 2011 02:26:25 +0000 (07:56 +0530)
commit31c1177970124cee31823cab3a11542c23b4126d
tree9ca2aa173877629e48995ce3085649db2c810056
parent894d4ba16f28a4bdd274378d9669d76a717eec31
parent0a71622aa731c62c89ba84ef86d21fd168521ee1
Merge branch '1.0.x' into people_tags_rebase

Conflicts:
EVENTS.txt
actions/peopletag.php
actions/tagother.php
classes/Notice.php
js/util.js
js/util.min.js
lib/accountprofileblock.php
lib/action.php
lib/activityobject.php
lib/command.php
lib/personalgroupnav.php
plugins/OStatus/OStatusPlugin.php
23 files changed:
EVENTS.txt
actions/public.php
actions/selftag.php
classes/Notice.php
classes/statusnet.ini
db/core.php
js/util.js
js/util.min.js
lib/accountprofileblock.php
lib/action.php
lib/activityobject.php
lib/command.php
lib/commandinterpreter.php
lib/default.php
lib/framework.php
lib/personalgroupnav.php
lib/publicgroupnav.php
lib/router.php
lib/subgroupnav.php
lib/util.php
plugins/OStatus/OStatusPlugin.php
theme/base/css/display.css
theme/default/css/display.css