Erik Johnston 10294b6082 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor ...

Conflicts:
	synapse/storage/_base.py

2014-08-14 10:01:04 +01:00

..

schema

Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

2014-08-14 10:01:04 +01:00

__init__.py

Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

2014-08-14 10:01:04 +01:00

_base.py

Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

2014-08-14 10:01:04 +01:00

directory.py

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00

feedback.py

Make feedback table also store sender.

2014-08-13 18:03:41 +01:00

pdu.py

when we're talking about backfilling data in federation, call it backfilling - not pagination.

2014-08-13 18:17:09 +01:00

presence.py

An initial hack at storing presence state-change mtimes in database and presenting age durations to clients/federation events

2014-08-13 19:19:15 +01:00

profile.py

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00

registration.py

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00

room.py

Return the room_alias when GETing public rooms.

2014-08-13 11:57:49 +01:00

roommember.py

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00

stream.py

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00

transactions.py

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00