Mark Haines 4ecfbac85f Merge branch 'develop' into markjh/dead_code		2016-02-24 16:37:46 +00:00
..
api	Allow third_party_signed to be specified on /join	2016-02-23 15:11:25 +00:00
app	…
appservice	…
config	…
crypto	…
events	…
federation	Allow third_party_signed to be specified on /join	2016-02-23 15:11:25 +00:00
handlers	Generate guest access token on 3pid invites	2016-02-24 14:41:25 +00:00
http	…
metrics	…
push	…
rest	Remove unused get_rule_attr method	2016-02-24 16:31:07 +00:00
static/client	…
storage	Generate guest access token on 3pid invites	2016-02-24 14:41:25 +00:00
streams	…
util	Change the way we figure out presence updates for small deltas	2016-02-23 14:54:40 +00:00
__init__.py	…
notifier.py	…
python_dependencies.py	Allow third_party_signed to be specified on /join	2016-02-23 15:11:25 +00:00
server.py	…
state.py	…
types.py	…