diff options
| author | Dafydd Harries <dafydd.harries@collabora.co.uk> | 2008-01-03 16:33:23 (GMT) |
|---|---|---|
| committer | Dafydd Harries <dafydd.harries@collabora.co.uk> | 2008-01-03 16:33:23 (GMT) |
| commit | 76984f3f2808c3fe3cf3f6472ae3cbd0c9ece8ee (patch) | |
| tree | 5bf9b235a467b4208295a206c5410839467aba18 /NEWS | |
| parent | 43adcff1a662463e2989539708badb8fde0a60b6 (diff) | |
| parent | ae12e8717ca9ed0c92409742f9814f28e62ca1c4 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/presence-service
Conflicts:
NEWS
Diffstat (limited to 'NEWS')
| -rw-r--r-- | NEWS | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1,3 +1,6 @@ + +* #5368: Delay setting a buddy's current activity (morgs) + Snapshot 5650e153bd * #4965: Add SyncFriends method as temporary measure for synchronising friends |