Merge branch 'master' into module-presence

Conflicts:
	specification/modules/presence.rst
This commit is contained in:
Kegan Dougal 2015-10-01 15:46:52 +01:00
commit cc6f256b24
16 changed files with 209 additions and 27 deletions

View file

@ -1,6 +1,8 @@
Presence
========
.. _module:presence:
Each user has the concept of presence information. This encodes:
* Whether the user is currently online