Shashi Gowda
31c1177970
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
2011-03-22 07:56:25 +05:30
..
2011-03-22 07:56:25 +05:30
2010-03-18 14:29:35 +01:00
2009-04-14 23:13:02 +00:00
2009-04-14 23:13:02 +00:00
2009-04-14 23:13:02 +00:00
2010-02-02 13:12:03 +01:00