Merge branch '0.9.x' into facebook-upgrade

[quix0rs-gnu-social.git] / EVENTS.txt

diff --git a/EVENTS.txt b/EVENTS.txt
index d31f2a227e4c317322733cedc2e4a2a924ccc82e..8bdc93db82c0dc80bf99232fdca27d1fb38334f4 100644 (file)
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -1180,3 +1180,11 @@ StartRevokeRole: when a role is being revoked
 EndRevokeRole: when a role has been revoked
 - $profile: profile that lost the role
 - $role: string name of the role
+
+StartAtomPubNewActivity: When a new activity comes in through Atom Pub API
+- &$activity: received activity
+
+EndAtomPubNewActivity: When a new activity comes in through Atom Pub API
+- $activity: received activity
+- $notice: notice that was created
+