]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - lib/activityimporter.php
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
authorShashi Gowda <connect2shashi@gmail.com>
Thu, 7 Apr 2011 17:43:45 +0000 (23:13 +0530)
committerShashi Gowda <connect2shashi@gmail.com>
Thu, 7 Apr 2011 17:43:45 +0000 (23:13 +0530)
commitad86eb78d3dc395b438d1543a36eca509f53e9d4
tree014823c6613493202fa4cbe7d99b69b72eec0437
parent14aef781ad7c544016d362c937c8cdff57d0fcf0
parent5b9319d081309264772100a25d15e2db0538ccb6
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Conflicts:
js/util.min.js
lib/default.php
EVENTS.txt
actions/public.php
classes/Notice.php
classes/Profile.php
js/util.js
js/util.min.js
lib/default.php
lib/framework.php
theme/neo/css/display.css