diff options
| author | Morgan Collett <morgan.collett@gmail.com> | 2007-11-22 14:11:28 (GMT) |
|---|---|---|
| committer | Morgan Collett <morgan.collett@gmail.com> | 2007-11-22 14:11:28 (GMT) |
| commit | 150051a3a9d8fb64a3a6a09de4f1912a7d6a1207 (patch) | |
| tree | 9c49d72cb8ad1e040614e5cabe9f557453414225 /NEWS | |
| parent | 8ea638b36dc3f617e9a66758c427c97923cce769 (diff) | |
| parent | b70f76d266bf645162b11cbc4daa7bb456111763 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/presence-service
Conflicts:
NEWS
Diffstat (limited to 'NEWS')
| -rw-r--r-- | NEWS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,5 +1,6 @@ * #4920: Harden _add_buddies to cope with no handle when calling BuddyHandleJoined (morgs) +* #4993: Only approve subscriptions coming from a trusted server (cassidy) Snapshot 4c8e8b71b5 |