Daniel Wagner-Hall feedaa37fa Merge branch 'develop' into daniel/roomcleanupincremental ...

Conflicts:
	synapse/handlers/room.py

2016-02-16 11:34:48 +00:00

..

__init__.py

copyrights

2016-01-07 04:26:29 +00:00

_base.py

Use update_membership to kick guests

2016-02-15 16:40:22 +00:00

account_data.py

copyrights

2016-01-07 04:26:29 +00:00

admin.py

copyrights

2016-01-07 04:26:29 +00:00

appservice.py

copyrights

2016-01-07 04:26:29 +00:00

auth.py

Allow guests to upgrade their accounts

2016-01-05 18:01:18 +00:00

directory.py

Branch off member and non member sends

2016-02-15 18:21:30 +00:00

events.py

Fix up logcontexts

2016-02-08 14:26:45 +00:00

federation.py

Branch off member and non member sends

2016-02-15 18:21:30 +00:00

identity.py

Add missing param to the log line

2016-01-29 15:01:26 +00:00

message.py

Branch off member and non member sends

2016-02-15 18:21:30 +00:00

presence.py

Fix up logcontexts

2016-02-08 14:26:45 +00:00

profile.py

Use update_membership for profile updates

2016-02-15 17:14:34 +00:00

receipts.py

copyrights

2016-01-07 04:26:29 +00:00

register.py

Enforce user_id exclusivity for AS registrations

2016-02-11 17:37:38 +00:00

room.py

Merge branch 'develop' into daniel/roomcleanupincremental

2016-02-16 11:34:48 +00:00

search.py

copyrights

2016-01-07 04:26:29 +00:00

sync.py

Use _simple_select_many for _get_state_group_for_events

2016-02-10 12:57:50 +00:00

typing.py

Measure some /sync related things

2016-02-09 11:31:42 +00:00