Erik Johnston 2ebf795c0a Merge branch 'develop' of github.com:matrix-org/synapse into rejections ...

Conflicts:
	synapse/storage/__init__.py
	synapse/storage/schema/delta/v12.sql

2015-01-30 11:10:37 +00:00

..

delta

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

2015-01-30 11:10:37 +00:00

event_edges.sql

Update copyright notices

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

event_signatures.sql

Update copyright notices

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

im.sql

Start implementing auth conflict res

2015-01-28 16:16:53 +00:00

keys.sql

Update copyright notices

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

media_repository.sql

Update copyright notices

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

presence.sql

Update copyright notices

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

profiles.sql

Update copyright notices

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

pusher.sql

Oops: second part of commit dc938606

2015-01-22 17:38:53 +00:00

redactions.sql

Update copyright notices

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

room_aliases.sql

Update copyright notices

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

state.sql

Update copyright notices

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

transactions.sql

Add index on transaction_id to sent_transcations

2015-01-06 15:40:38 +00:00

users.sql

Update copyright notices

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