summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Load the current id in the IdGenerator constructorMark Haines2016-03-0112-77/+52
* Merge pull request #607 from matrix-org/dbkr/send_inviter_member_eventDavid Baker2016-02-261-1/+7
|\
| * Merge remote-tracking branch 'origin/develop' into dbkr/send_inviter_member_e...David Baker2016-02-261-2/+4
| |\
| * | Send the invier's member event in room invite state so the invitee has their ...David Baker2016-02-251-1/+7
* | | Add support for changing the actions for default rulesMark Haines2016-02-263-11/+102
| |/ |/|
* | Fix to appease the PEP8 dragonGergely Polonkai2016-02-261-1/+3
* | Add error codes for malformed/bad JSON in /loginGergely Polonkai2016-02-261-2/+2
|/
* Make sure we return a JSON object when returning the values of specif…Mark Haines2016-02-251-1/+3
* Merge branch 'develop' into markjh/dead_codeMark Haines2016-02-244-0/+91
|\
| * Generate guest access token on 3pid invitesDaniel Wagner-Hall2016-02-244-0/+91
* | Remove unused get_rule_attr methodMark Haines2016-02-241-8/+0
|/
* Ignore invalid POST bodies when joining roomsDaniel Wagner-Hall2016-02-241-2/+12
* Merge pull request #603 from matrix-org/erikj/presenceErik Johnston2016-02-231-6/+9
|\
| * Create a new stream_id per presence updateErik Johnston2016-02-231-6/+9
* | Check presence token interval is less than 100, rather than the token itselfErik Johnston2016-02-231-4/+4
* | Merge pull request #602 from matrix-org/erikj/presenceErik Johnston2016-02-232-19/+61
|\|
| * Handle get_all_entities_changed returning NoneErik Johnston2016-02-231-0/+3
| * Add commentsErik Johnston2016-02-231-0/+4
| * Change the way we figure out presence updates for small deltasErik Johnston2016-02-232-17/+52
* | Allow third_party_signed to be specified on /joinDaniel Wagner-Hall2016-02-237-54/+196
* | Merge pull request #600 from matrix-org/erikj/presenceErik Johnston2016-02-231-26/+30
|\|
| * Don't include defer.returnValue in Measure blockErik Johnston2016-02-231-9/+12
| * Measure PresenceEventSource.get_new_eventsErik Johnston2016-02-231-34/+35
* | handlers/sync: style fix, line too longPatrik Oldsberg2016-02-231-1/+5
* | Pick up currently_active across federationErik Johnston2016-02-231-0/+1
* | handlers/sync: fix SyncResult not counting account_data change when convertin...Patrik Oldsberg2016-02-231-1/+1
* | Merge pull request #587 from matrix-org/rav/guest_access_after_room_joinRichard van der Hoff2016-02-223-16/+41
|\ \ | |/ |/|
| * address review commentsRichard van der Hoff2016-02-221-7/+2
| * Interpret unknown visibilities the same as sharedRichard van der Hoff2016-02-191-11/+13
| * Merge branch 'develop' into rav/guest_access_after_room_joinRichard van der Hoff2016-02-1938-1631/+1598
| |\
| * | Allow guest users access to messages in rooms they have joinedRichard van der Hoff2016-02-193-14/+42
* | | Remove superfluous call to get_state_at when we already have an event for tha...Erik Johnston2016-02-221-4/+12
* | | Correctly filter statesErik Johnston2016-02-191-2/+2
* | | Only send presence updates to remote hosts if user is oursErik Johnston2016-02-191-2/+10
* | | Add Measures to presenceErik Johnston2016-02-191-57/+62
| |/ |/|
* | Add presence metricErik Johnston2016-02-191-0/+3
* | Remove spurious extra metricsErik Johnston2016-02-191-1/+0
* | Merge pull request #586 from matrix-org/erikj/presenceErik Johnston2016-02-192-6/+32
|\ \
| * | Don't set currently_active for remote presenceErik Johnston2016-02-191-6/+12
| * | More metricsErik Johnston2016-02-191-0/+6
| * | Add presence metricsErik Johnston2016-02-192-0/+14
* | | Merge pull request #582 from matrix-org/erikj/presenceErik Johnston2016-02-1922-1123/+1122
|\| |
| * | "You are not..."Erik Johnston2016-02-181-1/+1
| * | Close cursorErik Johnston2016-02-181-0/+1
| * | Remove unused param from get_max_tokenErik Johnston2016-02-186-13/+11
| * | WheelTimer: Don't scan list, use index.Erik Johnston2016-02-181-5/+8
| * | Remove invalid arg.Erik Johnston2016-02-181-1/+0
| * | Add unit testErik Johnston2016-02-181-93/+187
| * | Add stuff pulled from the DB to the cacheErik Johnston2016-02-181-2/+4
| * | PEP8Erik Johnston2016-02-181-2/+2
| * | Prefix TS fields with _tsErik Johnston2016-02-184-43/+44
| * | Remove status_msg when going offline. Don't offline -> online if you send a m...Erik Johnston2016-02-181-5/+15
| * | Check presence state is a valid oneErik Johnston2016-02-182-1/+6
| * | Move if statementErik Johnston2016-02-181-8/+8
| * | CommentErik Johnston2016-02-181-0/+2
| * | Remove spurious commentErik Johnston2016-02-171-1/+0
| * | Initial cutErik Johnston2016-02-1715-1134/+931
| * | Add wheeltimer implErik Johnston2016-02-171-0/+88
* | | Merge pull request #573 from matrix-org/erikj/sync_fixErik Johnston2016-02-181-5/+12
|\ \ \
| * | | Mitigate against incorrect old state in /sync.Erik Johnston2016-02-121-5/+12
* | | | Remove dead code for setting device specific rules.Mark Haines2016-02-1810-141/+45
* | | | Review commentsDaniel Wagner-Hall2016-02-183-7/+7
* | | | Merge branch 'develop' into daniel/roomcleanupincrementalDaniel Wagner-Hall2016-02-174-85/+92
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #580 from Rugvip/developErik Johnston2016-02-171-1/+4
| |\ \ \ | | |_|/ | |/| |
| | * | api/filtering: don't assume that event content will always be a dictPatrik Oldsberg2016-02-171-1/+4
| * | | client/v1/room: include event_id in response to state event PUT, in accordanc...Patrik Oldsberg2016-02-171-2/+2
| |/ /
| * | Fix typo in request validation for adding push rules.Mark Haines2016-02-161-1/+1
| * | Make adding push rules idempotentMark Haines2016-02-161-82/+86
* | | Some cleanupDaniel Wagner-Hall2016-02-172-69/+61
* | | Respond to federated invite with non-empty contextDaniel Wagner-Hall2016-02-173-46/+65
* | | Some cleanup, some TODOs, more to doDaniel Wagner-Hall2016-02-161-68/+60
* | | Some cleanupDaniel Wagner-Hall2016-02-162-23/+30
* | | Tidy? up room creation event sendingDaniel Wagner-Hall2016-02-161-63/+72
* | | Add commentDaniel Wagner-Hall2016-02-161-1/+1
* | | Merge branch 'develop' into daniel/roomcleanupincrementalDaniel Wagner-Hall2016-02-161-3/+3
|\| |
| * | Simplify room creation codeDaniel Wagner-Hall2016-02-152-55/+31
* | | Branch off member and non member sendsDaniel Wagner-Hall2016-02-155-74/+99
* | | Simplify room creation codeDaniel Wagner-Hall2016-02-152-52/+28
* | | Use update_membership for profile updatesDaniel Wagner-Hall2016-02-152-20/+12
* | | Use update_membership to kick guestsDaniel Wagner-Hall2016-02-152-16/+19
* | | Reuse update_membership from /joinDaniel Wagner-Hall2016-02-152-19/+14
* | | Inline _do_local_membership_updateDaniel Wagner-Hall2016-02-151-18/+7
* | | Inline _do_join as it now only has one callerDaniel Wagner-Hall2016-02-151-48/+47
* | | Merge implementation of /join by alias or IDDaniel Wagner-Hall2016-02-155-70/+71
* | | Merge some room joining codepathsDaniel Wagner-Hall2016-02-152-5/+11
|/ /
* | Revert "Merge two of the room join codepaths"Daniel Wagner-Hall2016-02-125-73/+69
* | Merge two of the room join codepathsDaniel Wagner-Hall2016-02-125-69/+73
* | Catch the exceptions thrown by twisted when you write to a closed connectionMark Haines2016-02-125-11/+33
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-02-121-1/+1
|\|
| * Bump version and changelogErik Johnston2016-02-111-1/+1
| * Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-02-111-1/+1
| |\
| | * Bump version and changelogErik Johnston2016-02-111-1/+1
* | | Enforce user_id exclusivity for AS registrationsDaniel Wagner-Hall2016-02-111-5/+12
|/ /
* / Fix SYN-627, events are in incorrect room in /syncErik Johnston2016-02-111-1/+1
|/
* Return events in correct order for /eventsErik Johnston2016-02-112-8/+12
* Add some paranoia loggingErik Johnston2016-02-111-0/+10
* 0.13.1 v0.13.1Matthew Hodgson2016-02-101-1/+1
* Merge branch 'master' of git+ssh://github.com/matrix-org/synapseMatthew Hodgson2016-02-10257-2954/+4782
|\
| * Bump version and changelogErik Johnston2016-02-101-1/+1
| * Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.13.0Erik Johnston2016-02-1077-1065/+1540
| |\
| | * Batch fetch _get_state_groups_from_groupsErik Johnston2016-02-101-32/+34
| | * Use _simple_select_many for _get_state_group_for_eventsErik Johnston2016-02-102-17/+11
| | * Only calculate initial sync for 10 rooms at a timeErik Johnston2016-02-101-24/+29
| | * Merge pull request #566 from matrix-org/erikj/logcontextErik Johnston2016-02-101-16/+13
| | |\
| | | * Remove commentErik Johnston2016-02-101-1/+1
| | | * s/parent_context/previous_context/Erik Johnston2016-02-101-9/+9
| | | * Set parent context on instansiationErik Johnston2016-02-101-2/+7
| | | * Don't bother copying records on parent contextErik Johnston2016-02-091-8/+0
| | * | Merge pull request #568 from matrix-org/erikj/unread_notifErik Johnston2016-02-107-89/+66
| | |\ \
| | | * | Rename functionsErik Johnston2016-02-102-4/+4
| | | * | Atomically persit push actions when we persist the eventErik Johnston2016-02-096-65/+49
| | | * | Pass in current state to push action handlerErik Johnston2016-02-093-27/+20
| | * | | Merge pull request #565 from matrix-org/erikj/macaroon_configErik Johnston2016-02-092-16/+30
| | |\ \ \
| | | * | | Derive macaroon_secret_key from signing key.Erik Johnston2016-02-082-16/+30
| | * | | | Change a log from debug to infoErik Johnston2016-02-091-1/+1
| | | |/ / | | |/| |
| | * | | Remove dead codeErik Johnston2016-02-091-12/+0
| | * | | Invalidate get_last_receipt_event_id_for_user cacheErik Johnston2016-02-091-0/+5
| | * | | Don't load all ephemeral state for a room on every syncErik Johnston2016-02-092-14/+20
| | * | | Fix unit testsErik Johnston2016-02-092-5/+9
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2016-02-093-6/+6
| | |\ \ \
| | | * | | Revert "Reject additional path segments"Daniel Wagner-Hall2016-02-093-6/+6
| | | | |/ | | | |/|
| | * | | Measure some /sync related thingsErik Johnston2016-02-092-150/+162
| | * | | Revert to putting it around the entire blockErik Johnston2016-02-091-124/+124
| | * | | Don't create new logging contextErik Johnston2016-02-091-12/+15
| | |/ /
| | * | Fix bug in util.metrics.MeasureErik Johnston2016-02-091-1/+3
| | * | Create new context when measuringErik Johnston2016-02-091-2/+5
| | * | Don't measure across event stream call, as it lasts for a long time.Erik Johnston2016-02-091-124/+124
| | * | Change logcontext warns to debugErik Johnston2016-02-091-3/+3
| | |/
| | * Merge pull request #564 from matrix-org/erikj/logcontextErik Johnston2016-02-0831-229/+356
| | |\
| | | * Fix up logcontextsErik Johnston2016-02-0831-229/+356
| | * | Merge pull request #562 from matrix-org/erikj/push_metricErik Johnston2016-02-083-31/+149
| | |\|
| | | * Add metrics to pushersErik Johnston2016-02-083-31/+149
| | * | Reject additional path segmentsDaniel Wagner-Hall2016-02-083-6/+6
| | |/
| | * Allocate guest user IDs numericcallyDaniel Wagner-Hall2016-02-052-19/+72
| | * Host /media/r0 as well as /media/v1Daniel Wagner-Hall2016-02-052-3/+6
| | * Error if macaroon key is missing from configDaniel Wagner-Hall2016-02-054-23/+57
| | * Merge pull request #557 from matrix-org/dbkr/profile_dont_return_nullDavid Baker2016-02-041-6/+17
| | |\
| | | * No braces hereDavid Baker2016-02-031-1/+1
| | | * Don't return null if profile display name / avatar url isn't set: omit them i...David Baker2016-02-031-6/+17
| | * | Actually return something sensibleErik Johnston2016-02-031-1/+1
| | * | Remove old log lineErik Johnston2016-02-031-2/+0
| | * | We return dicts now.Erik Johnston2016-02-031-1/+1
| | * | Add descriptionsErik Johnston2016-02-034-1/+5
| | * | Preserve log context over when deferring to thread pool in media repoErik Johnston2016-02-031-4/+7
| | * | Merge pull request #555 from matrix-org/erikj/logcontextErik Johnston2016-02-033-16/+42
| | |\ \
| | | * | Allowing tagging log contextsErik Johnston2016-02-033-16/+42
| | * | | Merge pull request #554 from matrix-org/erikj/event_pushErik Johnston2016-02-035-21/+67
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Change event_push_actions_rm_tokens schemaErik Johnston2016-02-035-21/+67
| | | |/
| | * | Merge pull request #556 from matrix-org/daniel/configDaniel Wagner-Hall2016-02-033-6/+6
| | |\ \
| | | * | Rename config field to reflect yaml nameDaniel Wagner-Hall2016-02-033-6/+6
| | | |/
| | * | Simplify get_roomsErik Johnston2016-02-032-79/+9
| | * | PEP8Erik Johnston2016-02-031-1/+1
| | * | Remove unused methodErik Johnston2016-02-031-8/+0
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_roo...Erik Johnston2016-02-0335-238/+215
| | |\|
| | | * Log more diagnostics for unrecognised access tokensDaniel Wagner-Hall2016-02-021-0/+2
| | | * Fix flake8 warnings for new flake8Daniel Wagner-Hall2016-02-0233-66/+72
| | | * s/get_room_changes_for_user/get_membership_changes_for_user/Erik Johnston2016-02-023-4/+4
| | | * Fetch events in a separate transaction.Erik Johnston2016-02-021-26/+29
| | | * Merge pull request #545 from matrix-org/erikj/syncErik Johnston2016-02-022-141/+99
| | | |\
| | | | * CommentsErik Johnston2016-02-011-5/+6
| | | | * Move state calculations from rest to handlerErik Johnston2016-02-012-141/+98
| | | * | Pass make_guest whne we autogen a user IDDavid Baker2016-02-021-1/+3
| | | * | WARN if we get a topo token instead of stream.Erik Johnston2016-02-021-1/+6
| | | * | Merge pull request #547 from matrix-org/dbkr/fix_guest_upgradeDavid Baker2016-02-021-0/+1
| | | |\ \
| | | | * | Pull guest access token out of the auth session params, otherwise it will bre...David Baker2016-02-011-0/+1
| | | | |/
| | * | | Unused importErik Johnston2016-02-031-1/+1
| | * | | Change the way we do public room list fetchingErik Johnston2016-02-023-24/+80
| | |/ /
| | * | Order things correctlyErik Johnston2016-02-012-1/+5
| | * | Switch over /events to use per room cachesErik Johnston2016-02-012-7/+22
| | |/
| | * Merge pull request #543 from matrix-org/erikj/syncErik Johnston2016-02-013-0/+15
| | |\
| | | * Cache get_room_changes_for_userErik Johnston2016-01-293-0/+15
| | * | Only use room_ids if in get_room_events_stream if is_guestErik Johnston2016-02-011-5/+0
| | * | Don't use before_token. Its wrong. Use actual limit.Erik Johnston2016-01-311-6/+3
| | |/
| | * Invalidate _account_data_stream_cache correctlyErik Johnston2016-01-291-0/+4
| | * If stream pos is greater then earliest known key and entity hasn't changed, t...Erik Johnston2016-01-291-8/+3
| | * Merge pull request #540 from matrix-org/erikj/syncErik Johnston2016-01-294-19/+56
| | |\
| | | * Comment. Remove superfluous order byErik Johnston2016-01-291-1/+3
| | | * Don't prefill account dataErik Johnston2016-01-291-8/+1
| | | * Actually use cacheErik Johnston2016-01-291-7/+13
| | | * Max is not a functionErik Johnston2016-01-291-1/+1
| | | * Convert param styleErik Johnston2016-01-291-0/+3
| | | * Prefill stream change cachesErik Johnston2016-01-294-19/+52
| | * | Merge pull request #541 from matrix-org/erikj/fixsomeofpushErik Johnston2016-01-291-9/+14
| | |\ \
| | | * | Deal with None limitErik Johnston2016-01-291-1/+5
| | | * | Make /events always return a newer token, if one existsErik Johnston2016-01-291-9/+10
| | | |/
| | * | Add missing param to the log lineMark Haines2016-01-291-1/+2
| | * | Merge remote-tracking branch 'origin/develop' into markjh/3pidMark Haines2016-01-2913-336/+557
| | |\|
| | * | Add config option for setting the trusted id servers, disabling checking the ...Mark Haines2016-01-292-8/+24
| | * | Allow three_pid_creds as well as threePidCreds in /account/3pidMark Haines2016-01-291-2/+3
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.12.1Erik Johnston2016-01-2928-702/+859
| |\ \ \ | | | |/ | | |/|
| | * | Bump AccountDataAndTagsChangeCache sizeErik Johnston2016-01-291-1/+1
| | * | Don't work out unread_notifs_for_room_id unless neededErik Johnston2016-01-291-11/+12
| | * | Merge pull request #536 from matrix-org/erikj/syncErik Johnston2016-01-299-316/+500
| | |\ \
| | | * | Amalgamate tags and account data stream cachesErik Johnston2016-01-282-12/+9
| | | * | If the same as the earliest key, assume nothing has changed.Erik Johnston2016-01-281-0/+5
| | | * | Correctly update _entity_to_keyErik Johnston2016-01-281-4/+5
| | | * | Fix inequalitiesErik Johnston2016-01-281-2/+2
| | | * | Don't use defer.returnValueErik Johnston2016-01-281-1/+1
| | | * | Include cache hits with has_entity_changedErik Johnston2016-01-281-0/+4
| | | * | Add events indexErik Johnston2016-01-281-0/+16
| | | * | Change name and doc has_entity_changedErik Johnston2016-01-284-4/+6
| | | * | Cache tags and account dataErik Johnston2016-01-287-102/+137
| | | * | Ensure keys to RoomStreamChangeCache are intsErik Johnston2016-01-282-5/+12
| | | * | Invalidate caches properly. Remove unused argErik Johnston2016-01-284-10/+15
| | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-283-26/+18
| | | |\ \
| | | * | | Change load limit paramsErik Johnston2016-01-281-2/+2
| | | * | | Amalgamate incremental and full sync for userErik Johnston2016-01-281-40/+16
| | | * | | Allow paginating backwards from stream tokenErik Johnston2016-01-282-8/+23
| | | * | | Return correct type of tokenErik Johnston2016-01-281-3/+6
| | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-282-23/+22
| | | |\ \ \
| | | * | | | No chdirErik Johnston2016-01-271-1/+0
| | | * | | | PEP8Erik Johnston2016-01-273-6/+9
| | | * | | | Use the same path for incremental with gap or without gapErik Johnston2016-01-273-212/+147
| | | * | | | Add cache to room streamErik Johnston2016-01-275-74/+254
| | | * | | | Don't turn on profilingErik Johnston2016-01-271-1/+1
| | * | | | | Merge pull request #538 from matrix-org/erikj/fix_lru_cacheErik Johnston2016-01-292-8/+38
| | |\ \ \ \ \
| | | * | | | | Directly set self.valueErik Johnston2016-01-291-1/+1
| | | * | | | | Remove spurious self.sizeErik Johnston2016-01-291-1/+0
| | | * | | | | Correctly bookkeep the size of TreeCacheErik Johnston2016-01-291-3/+28
| | | * | | | | Make TreeCache keep track of its own size.Erik Johnston2016-01-292-6/+10
| | | * | | | | Reset size on clearErik Johnston2016-01-291-0/+2
| | | | |_|_|/ | | | |/| | |
| | * | | | | Fix testErik Johnston2016-01-281-0/+5
| | * | | | | Cache filtersErik Johnston2016-01-281-1/+2
| | |/ / / /
| | * | | / Pin pynacl to 0.3.0Daniel Wagner-Hall2016-01-281-1/+1
| | | |_|/ | | |/| |
| | * | | Merge pull request #534 from matrix-org/erikj/setupErik Johnston2016-01-289-115/+111
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Clean up a bit. Add commentErik Johnston2016-01-283-26/+18
| | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setupErik Johnston2016-01-271-1/+1
| | | |\ \ | | | | |/ | | | |/|
| | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setupErik Johnston2016-01-274-9/+27
| | | |\ \
| | | * | | PEP 8Erik Johnston2016-01-271-1/+0
| | | * | | Add a Homeserver.setup method.Erik Johnston2016-01-269-116/+121
| | * | | | Up get_rooms_for_user cache sizeErik Johnston2016-01-281-1/+1
| | * | | | Merge pull request #535 from matrix-org/rav/paginate_from_stream_tokenRichard van der Hoff2016-01-281-22/+21
| | |\ \ \ \
| | | * | | | Make it possible to paginate forwards from stream tokensRichard van der Hoff2016-01-271-22/+21
| | | | |/ / | | | |/| |
| | * | | | Remove chdirErik Johnston2016-01-281-1/+0
| | | |_|/ | | |/| |
| | * | | Merge pull request #530 from matrix-org/erikj/server_refactorErik Johnston2016-01-277-230/+160
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Don't turn on profilingErik Johnston2016-01-261-1/+1
| | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/server_ref...Erik Johnston2016-01-262-2/+8
| | | |\ \ | | | | |/ | | | |/|
| | | * | Remove redundated BaseHomeServerErik Johnston2016-01-267-231/+161
| | * | | Merge pull request #533 from matrix-org/rav/hashtest_federationRichard van der Hoff2016-01-271-1/+7
| | |\ \ \
| | | * | | Federation: drop events which cause SynapseErrorsRichard van der Hoff2016-01-271-1/+7
| | | | |/ | | | |/|
| | * | | Merge pull request #531 from matrix-org/markjh/relative_push_rulesMark Haines2016-01-272-6/+12
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix adding push rules relative to other rulesMark Haines2016-01-272-6/+12
| * | | | Bump version and changelogErik Johnston2016-01-271-1/+1
| |/ / /
| * / / Only notify for messages in one to one rooms, not every eventDavid Baker2016-01-261-0/+6
| |/ /
| * | Merge pull request #528 from matrix-org/markjh/missing_yieldMark Haines2016-01-251-2/+2
| |\ \ | | |/ | |/|
| | * Add missing yield in push_rules set enabledMark Haines2016-01-251-2/+2
| * | Merge pull request #524 from matrix-org/erikj/syncErik Johnston2016-01-253-87/+174
| |\ \
| | * | PEP8Erik Johnston2016-01-251-1/+0
| | * | Remove weird stuffErik Johnston2016-01-251-6/+0
| | * | Fix testsErik Johnston2016-01-251-1/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-16 13:06:30 +0000