From: Zach Copley <zach@status.net>
Date: Sun, 10 Apr 2011 08:10:01 +0000 (+0000)
Subject: Merge branch 'people_tags_rebase' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e75c9988ebe33822e493ac225859bc593ff9b855;p=quix0rs-gnu-social.git

Merge branch 'people_tags_rebase' into 1.0.x

Conflicts:
	EVENTS.txt
---

e75c9988ebe33822e493ac225859bc593ff9b855
diff --cc EVENTS.txt
index eb848bb888,80708ed882..4614ef3da5
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@@ -1160,26 -1310,6 +1310,27 @@@ StartShowGroupProfileBlock: When showin
  - $out: XMLOutputter to append custom output
  - $profile: the profile being shown
  
--EndShowGroupProfileBlock: After showing showing the profile block for a group
++EndShowGroupProfileBlock: After showing the profile block for a group
  - $out: XMLOutputter to append custom output
  - $group: the group being shown
 +
 +StartShowThreadedNoticeTail: when showing the replies etc. to a notice
 +- $nli: parent noticelistitem
 +- $notice: parent notice
 +- &$children: list of children
 +
 +EndShowThreadedNoticeTail: when showing the replies etc. to a notice
 +- $nli: parent noticelistitem
 +- $notice: parent notice
 +- $children: list of children
 +
 +StartShowThreadedNoticeSub: when showing a reply to a notice
 +- $nli: parent noticelistitem
 +- $parent: parent notice
 +- $child: child notice
 +
 +EndShowThreadedNoticeSub: when showing a reply to a notice
 +- $nli: parent noticelistitem
 +- $parent: parent notice
 +- $child: child notice
++