Mark Haines 4ad8b45155 Merge branch 'develop' into key_distribution ...

Conflicts:
	synapse/config/homeserver.py

2015-04-29 13:15:14 +01:00

..

api

Merge branch 'develop' into key_distribution

2015-04-29 13:15:14 +01:00

app

Merge branch 'develop' into key_distribution

2015-04-29 13:15:14 +01:00

appservice

Fix more AS sender ID thinkos.

2015-04-01 14:05:24 +01:00

config

Merge branch 'develop' into key_distribution

2015-04-29 13:15:14 +01:00

crypto

Update the query format used by keyring to match current key v2 spec

2015-04-29 12:14:08 +01:00

events

Store the rejected reason in (Frozen)Event structs

2015-03-25 19:06:05 +00:00

federation

Add missing servlet to list

2015-03-19 17:48:21 +00:00

handlers

Ensure we never miss any presence updates

2015-04-28 17:24:24 +01:00

http

Merge branch 'develop' into csauth

2015-04-24 09:37:54 +01:00

metrics

Appease pep8

2015-04-01 19:17:38 +01:00

push

Merge branch 'develop' of github.com:matrix-org/synapse into postgres

2015-04-28 13:39:42 +01:00

rest

Merge branch 'develop' into key_distribution

2015-04-29 13:15:14 +01:00

storage

Merge branch 'develop' into key_distribution

2015-04-29 13:15:14 +01:00

streams

Update copyright notices

2015-01-06 13:21:39 +00:00

util

Merge branch 'develop' of github.com:matrix-org/synapse into postgres

2015-04-27 14:41:40 +01:00

__init__.py

Bump version

2015-04-17 13:25:16 +01:00

notifier.py

Change from exception to warn

2015-04-15 15:12:57 +01:00

python_dependencies.py

Copyright notices

2015-04-24 10:35:29 +01:00

server.py

Merge branch 'develop' into key_distribution

2015-04-29 13:15:14 +01:00

state.py

Remove concept of context.auth_events, instead use context.current_state

2015-03-16 13:06:23 +00:00

types.py

Rename ClientID to ClientInfo since it is a pair of IDs rather than a single identifier

2015-01-28 17:16:12 +00:00