summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | Remove rather pointless get functionDavid Baker2016-04-291-9/+1
| | * | | | | | Stop processing notifs once we've sent a mailDavid Baker2016-04-291-0/+1
| | * | | | | | Correct public_baseurl defaultDavid Baker2016-04-291-2/+2
| | * | | | | | Nicer get() shorthandDavid Baker2016-04-291-3/+2
| | * | | | | | Remove redundant docstringDavid Baker2016-04-291-4/+0
| | * | | | | | Correct default template and add text templateDavid Baker2016-04-291-1/+2
| | * | | | | | Send mail notifs with a plaintext part tooDavid Baker2016-04-292-7/+22
| | * | | | | | Add an email pusher for new usersDavid Baker2016-04-292-0/+27
| | * | | | | | pep8 newlineDavid Baker2016-04-291-1/+1
| | * | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifsDavid Baker2016-04-2935-323/+1188
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | May as well always include room linkDavid Baker2016-04-281-4/+3
| | * | | | | | Put back real delay before mailingDavid Baker2016-04-281-1/+1
| | * | | | | | Support file messages & fix plain textDavid Baker2016-04-281-2/+3
| | * | | | | | Support image notifsDavid Baker2016-04-281-11/+25
| | * | | | | | pep8David Baker2016-04-282-3/+6
| | * | | | | | Only import email pusher if email notifs are onDavid Baker2016-04-281-6/+8
| | * | | | | | Handle room invites in email notifsDavid Baker2016-04-282-8/+33
| | * | | | | | Linkify plain text messages tooDavid Baker2016-04-281-1/+12
| | * | | | | | Run filter_events_for_clientDavid Baker2016-04-277-20/+24
| | * | | | | | Make html messages workDavid Baker2016-04-271-10/+21
| | * | | | | | Better grammar for multiple messages in a roomDavid Baker2016-04-272-10/+33
| | * | | | | | Hopefully all remaining bits for email notifsDavid Baker2016-04-274-23/+161
| | * | | | | | More variable calculation for email notifsDavid Baker2016-04-252-18/+74
| | * | | | | | TypoDavid Baker2016-04-251-1/+1
| | * | | | | | No we don't: it's just the display nameDavid Baker2016-04-221-1/+0
| | * | | | | | Actually do UTF8 correctlyDavid Baker2016-04-221-1/+1
| | * | | | | | Sort member eventsDavid Baker2016-04-221-0/+4
| | * | | | | | Mime part is binary so encode it first.David Baker2016-04-221-1/+1
| | * | | | | | Implement group-of-people namesDavid Baker2016-04-221-17/+14
| | * | | | | | No inlineCallbacks necessary on thisDavid Baker2016-04-221-1/+0
| | * | | | | | Flesh out email templatingDavid Baker2016-04-214-4/+208
| | * | | | | | Generate mails from a templateDavid Baker2016-04-204-31/+49
| | * | | | | | more pep8David Baker2016-04-201-1/+1
| | * | | | | | Send a rather basic email notifDavid Baker2016-04-206-12/+136
| | * | | | | | Add single instance & logging stuffDavid Baker2016-04-191-8/+39
| | * | | | | | First bits of emailpusherDavid Baker2016-04-197-8/+335
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_userErik Johnston2016-05-096-28/+23
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge pull request #773 from matrix-org/erikj/get_domian_from_idErik Johnston2016-05-096-28/+23
| | |\ \ \ \ \ \
| | | * | | | | | Add and use get_domian_from_idErik Johnston2016-05-096-28/+23
| | | | |_|_|/ / | | | |/| | | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_userErik Johnston2016-05-0913-58/+479
| |\| | | | | |
| | * | | | | | Merge pull request #764 from matrix-org/erikj/replication_loggingErik Johnston2016-05-091-0/+9
| | |\ \ \ \ \ \
| | | * | | | | | Don't warnErik Johnston2016-05-051-2/+0
| | | * | | | | | Add some log information at returned replication streamsErik Johnston2016-05-051-0/+11
| | * | | | | | | Merge pull request #772 from matrix-org/erikj/get_user_cacheErik Johnston2016-05-091-0/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add cache to get_user_by_idErik Johnston2016-05-091-0/+3
| | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge pull request #770 from matrix-org/erikj/transaction_reactorErik Johnston2016-05-091-0/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | Run transaction queue on reactorErik Johnston2016-05-091-0/+3
| | | |/ / / / / /
| | * | | | | | | Remove unused importErik Johnston2016-05-061-1/+1
| | * | | | | | | Pull loop one level upErik Johnston2016-05-061-36/+41
| | * | | | | | | Queue events for persistenceErik Johnston2016-05-061-11/+144
| | |/ / / / / /
| | * | | | | | Pull prev txn from in memoryErik Johnston2016-05-061-5/+13
| | * | | | | | Don't needlessly enter transactionErik Johnston2016-05-061-9/+9
| | * | | | | | Reduce database inserts when sending transactionsErik Johnston2016-05-062-45/+114
| | * | | | | | Rename openid/token to openid/request_tokenMark Haines2016-05-051-2/+2
| | * | | | | | Add an openidish mechanism for proving to third parties that you own a given ...Mark Haines2016-05-057-2/+193
| | |/ / / / /
| * | | | | | Add bulk fetch storage APIErik Johnston2016-05-053-11/+26
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_userErik Johnston2016-05-047-2/+107
| |\| | | | |
| | * | | | | Merge pull request #762 from matrix-org/erikj/report_eventErik Johnston2016-05-046-1/+106
| | |\ \ \ \ \
| | | * | | | | Add primary keyErik Johnston2016-05-041-1/+1
| | | * | | | | Add timestamp and auto incrementing IDErik Johnston2016-05-044-1/+10
| | | * | | | | Move event_id to pathErik Johnston2016-05-041-4/+2
| | | * | | | | Add /report endpointErik Johnston2016-05-045-1/+99
| | | | |_|/ / | | | |/| | |
| | * | | | | Merge pull request #757 from matrix-org/erikj/event_auth_typoErik Johnston2016-05-031-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix typo in event_auth servlet pathErik Johnston2016-04-291-1/+1
| | | | |/ / | | | |/| |
| * | / | | Implement basic ignore userErik Johnston2016-05-044-9/+78
| |/ / / /
* / / / / add a url_preview_ip_range_whitelist config param so we can whitelist the mat...Matthew Hodgson2016-05-013-7/+27
|/ / / /
* / / / Fix password resetDavid Baker2016-04-291-0/+1
|/ / /
* | | Fix more typos in per-request metricsMark Haines2016-04-281-4/+5
* | | Fix typo in request metricsMark Haines2016-04-281-1/+1
* | | fix typoMatthew Hodgson2016-04-281-1/+1
* | | Add a comment explaining why automatic metric reporting is disabled for JsonR...Mark Haines2016-04-281-0/+4
* | | Check if report_metrics is TrueMark Haines2016-04-281-3/+4
* | | Report per request metrics for all of the things using request_handlerMark Haines2016-04-289-47/+76
* | | Merge pull request #755 from matrix-org/markjh/right_directionMark Haines2016-04-272-3/+3
|\ \ \
| * | | Fix backfill replication to advance the stream correctlyMark Haines2016-04-272-3/+3
* | | | Check that somethign has happend before running the selectsMark Haines2016-04-273-2/+14
|/ / /
* | | Actually start the pusher daemonMark Haines2016-04-261-0/+2
* | | Fix typo in default pusher configMark Haines2016-04-261-1/+1
* | | Add a log context to the daemonized pusherMark Haines2016-04-261-1/+6
* | | Optionally daemonize the pusherMark Haines2016-04-261-4/+31
| |/ |/|
* | Merge pull request #750 from matrix-org/erikj/jwt_optionalErik Johnston2016-04-263-7/+23
|\ \
| * | Make pyjwt dependency optionalErik Johnston2016-04-253-7/+23
* | | Add a couple of update methods to the PusherSlaveStoreMark Haines2016-04-261-0/+8
* | | Remove the uncomments from the commentsMark Haines2016-04-251-2/+2
* | | Add a metrics listener and a ssh listener to the pusherMark Haines2016-04-252-3/+92
* | | Move the listenTCP call outside the manhole functionMark Haines2016-04-252-16/+14
* | | Split out setting up the manhole to a separate fileMark Haines2016-04-222-26/+57
|/ /
* | Merge branch 'develop' into markjh/split_out_site.pyMark Haines2016-04-222-82/+105
|\ \
| * | Split out create_resource_tree to a separate fileMark Haines2016-04-222-82/+105
* | | Move SynapseSite to its own fileMark Haines2016-04-222-130/+149
|/ /
* | Merge pull request #746 from matrix-org/markjh/split_out_pusherMark Haines2016-04-225-1/+217
|\ \
| * | Optionally split out the pushers into a separate processMark Haines2016-04-215-1/+217
* | | Merge pull request #745 from matrix-org/erikj/search-indexErik Johnston2016-04-224-7/+169
|\ \ \
| * | | Simplify query and handle finishing correctlyErik Johnston2016-04-222-17/+16
| * | | Order NULLs firstErik Johnston2016-04-212-5/+16
| * | | Fix queryErik Johnston2016-04-211-2/+2
| * | | Use special UPDATE syntaxErik Johnston2016-04-212-22/+14
| * | | TypoErik Johnston2016-04-211-1/+1
| * | | Need to do _background_update_progress_txn in actual transactionErik Johnston2016-04-211-6/+8
| * | | Update progress when creating indexErik Johnston2016-04-211-0/+7
| * | | Fix SQL statementErik Johnston2016-04-211-3/+3
| * | | Create index must be on a connErik Johnston2016-04-211-6/+13
| * | | Create index concurrentlyErik Johnston2016-04-212-6/+14
| * | | Add missing run_upgradeErik Johnston2016-04-211-0/+4
| * | | Optimise event_search in postgresErik Johnston2016-04-213-5/+137
* | | | Merge pull request #687 from nikriek/jwt-fixErik Johnston2016-04-212-3/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix issues with JWT loginNiklas Riekenbrauck2016-04-212-3/+8
* | | | Merge pull request #743 from matrix-org/markjh/slave_pushersMark Haines2016-04-211-0/+52
|\ \ \ \
| * | | | Replicate the pushersMark Haines2016-04-211-0/+52
| | |/ / | |/| |
* | | | Merge pull request #744 from matrix-org/markjh/replication_remove_pusherMark Haines2016-04-212-3/+57
|\ \ \ \
| * | | | Add a replication endpoint for deleting pushersMark Haines2016-04-212-3/+57
| |/ / /
* / / / Replicate push actionsMark Haines2016-04-211-0/+14
|/ / /
* | | Always use state cache entry if it existsErik Johnston2016-04-201-3/+10
* | | Add some logging to state resolve_eventsErik Johnston2016-04-201-0/+5
* | | Merge pull request #739 from matrix-org/erikj/cache_get_state_groups_for_groupsErik Johnston2016-04-191-3/+16
|\ \ \
| * | | Add cache to _get_state_groups_from_groupsErik Johnston2016-04-191-3/+16
* | | | Merge pull request #738 from matrix-org/markjh/slaved_receiptsMark Haines2016-04-191-0/+61
|\ \ \ \ | |/ / / |/| | |
| * | | Add a slaved receipts storeMark Haines2016-04-191-0/+61
* | | | Merge pull request #737 from matrix-org/erikj/spider_ssl_factoryErik Johnston2016-04-191-1/+4
|\ \ \ \
| * | | | Make InsecureInterceptableContextFactory work with SpiderEndpointErik Johnston2016-04-191-1/+4
| |/ / /
* / / / Replicate get_invited_rooms_for_userMark Haines2016-04-191-2/+7
|/ / /
* | | Add self.media_repo to PreviewUrlResourceErik Johnston2016-04-191-0/+1
* | | _make_dirs was moved to MediaRepositoryErik Johnston2016-04-191-1/+1
* | | Add store to PreviewUrlResourceErik Johnston2016-04-191-0/+1
* | | Reorder importsErik Johnston2016-04-191-7/+8
| |/ |/|
* | Move MediaRepository to media_repository moduleErik Johnston2016-04-195-489/+496
* | Split out BaseMediaResource into MediaRepositoryErik Johnston2016-04-196-138/+180
* | Create log context in Measure if one doesn't existErik Johnston2016-04-181-6/+17
* | Merge pull request #733 from matrix-org/erikj/make_member_timeoutErik Johnston2016-04-181-1/+2
|\ \
| * | Lower timeout for make_membership_eventErik Johnston2016-04-151-1/+2
* | | Merge pull request #732 from matrix-org/erikj/loginErik Johnston2016-04-181-5/+9
|\ \ \
| * | | Simplify _check_passwordErik Johnston2016-04-151-5/+9
| |/ /
* | | explicitly pass in the charset from Content-Type to lxml to fix cyrillic woes...Matthew Hodgson2016-04-151-6/+18
* | | fix cyrillic URL previews by hardcoding all page decoding to UTF-8 for now, r...Matthew Hodgson2016-04-151-16/+8
|/ /
* | Use SynapseError 504 for Timeout errorsErik Johnston2016-04-151-1/+2
* | Fix check_password rather than inverting the meaning of _check_local_password...Mark Haines2016-04-141-9/+12
* | Merge pull request #729 from matrix-org/dbkr/fix_login_nonexistent_userDavid Baker2016-04-141-1/+1
|\ \
| * | Fix login to error for nonexistent usersDavid Baker2016-04-141-1/+1
* | | fix urlparse import thinko breaking tiny URLsMatthew Hodgson2016-04-141-5/+5
* | | Make v2_alpha reg follow the AS API specificationKegan Dougal2016-04-141-0/+5
* | | comment out 2c838f6459db35ad9812a83184d85a06ca5d940a due to risk of https://e...Matthew Hodgson2016-04-141-16/+16
* | | Measure push action generatorErik Johnston2016-04-141-11/+15
|/ /
* | Merge pull request #725 from matrix-org/dbkr/push_only_joinedErik Johnston2016-04-141-1/+13
|\ \
| * | Don't push for everyone who ever sent an RR to the roomDavid Baker2016-04-141-1/+13
* | | Add missing yieldErik Johnston2016-04-141-1/+1
* | | Rename log contextErik Johnston2016-04-141-1/+1
* | | Make send_badge privateErik Johnston2016-04-141-2/+2
* | | Add desc argErik Johnston2016-04-141-1/+5
* | | Add necessary logging contextsErik Johnston2016-04-141-24/+25
* | | Add indexErik Johnston2016-04-141-0/+18
* | | Add extra MeasureErik Johnston2016-04-141-14/+16
* | | Fix query for get_unread_push_actions_for_user_in_rangeErik Johnston2016-04-141-1/+2
* | | Merge pull request #721 from matrix-org/erikj/spiderErik Johnston2016-04-144-38/+41
|\ \ \ | |/ / |/| |
| * | Give install requirementsErik Johnston2016-04-131-1/+7
| * | Add back in helpful description for missing url_preview_ip_range_blacklistErik Johnston2016-04-131-1/+5
| * | Sanitize the optional dependencies for spider APIErik Johnston2016-04-134-38/+31
* | | Merge pull request #722 from matrix-org/dbkr/only_unread_event_actionsDavid Baker2016-04-131-9/+50
|\ \ \
| * | | pep8David Baker2016-04-131-1/+1
| * | | Only return unread notificationsDavid Baker2016-04-131-9/+50
* | | | Merge pull request #718 from matrix-org/erikj/public_room_listErik Johnston2016-04-131-5/+8
|\ \ \ \
| * | | | Don't return empty public roomsErik Johnston2016-04-121-5/+8
| | |/ / | |/| |
* | | | Merge pull request #720 from matrix-org/erikj/auth_checErik Johnston2016-04-133-18/+35
|\ \ \ \ | |_|/ / |/| | |
| * | | Measure Auth.checkErik Johnston2016-04-131-47/+50
| * | | Don't auto log failed auth checksErik Johnston2016-04-133-62/+76
| |/ /
* / / Unused member variableDavid Baker2016-04-121-1/+0
|/ /
* | Merge pull request #716 from matrix-org/dbkr/get_pushersDavid Baker2016-04-122-17/+71
|\ \
| * | UnneccessarywhitespaceisunnecessaryDavid Baker2016-04-121-1/+0
| * | Oops, forgot the desc.David Baker2016-04-121-1/+1
| * | Make the /set part mandatoryDavid Baker2016-04-121-1/+1
| * | Tidy up get_pusher functionsDavid Baker2016-04-121-32/+30
| * | Mis-named functionDavid Baker2016-04-122-2/+2
| * | Split into separate servlet classesDavid Baker2016-04-121-11/+16
| * | Add get endpoint for pushersDavid Baker2016-04-112-1/+53
* | | More commentsErik Johnston2016-04-121-0/+9
* | | More commentsErik Johnston2016-04-121-0/+6
* | | Don't append to unused listErik Johnston2016-04-121-4/+0
* | | Add back backfilled parameter that was removedErik Johnston2016-04-122-4/+7
* | | Add commentErik Johnston2016-04-121-0/+1
* | | Check if we've already backfilled eventsErik Johnston2016-04-122-7/+36
|/ /
* | Fix the rule_id for .m.rule.invite_for_me (#715)Mark Haines2016-04-111-1/+1
* | Move the versionstring code out of app.homeserver into utilMark Haines2016-04-113-83/+125
* | Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actionsDavid Baker2016-04-1119-628/+680
|\ \
| * | Run unsafe proces in a loop until we've caught upDavid Baker2016-04-111-4/+11
| * | Actually check if we;re processingDavid Baker2016-04-081-0/+2
| * | Fix invite pushesDavid Baker2016-04-084-39/+58
| * | Make sure max stream ordering only increasesDavid Baker2016-04-081-1/+1
| * | Unsafe process should call itself if the max has changedDavid Baker2016-04-081-0/+3
| * | Comment why unsafe process is unsafeDavid Baker2016-04-081-0/+5
| * | Literally a dictionaryDavid Baker2016-04-071-17/+17
| * | generate id in the main threadDavid Baker2016-04-071-3/+3
| * | Only pass in what we needDavid Baker2016-04-072-11/+13
| * | Oops, inequality failDavid Baker2016-04-071-1/+1
| * | Wrap process in a flag so we don't process whist already processing.David Baker2016-04-071-0/+9
| * | indentingDavid Baker2016-04-071-1/+1
| * | defer.gatherResults rather than doing all the pokes in seriesDavid Baker2016-04-071-2/+16
| * | Add measure blocksDavid Baker2016-04-071-5/+10
| * | Add comments on min_stream_idDavid Baker2016-04-072-0/+3
| * | pep8David Baker2016-04-071-0/+1
| * | Fix port script for changes merged from developDavid Baker2016-04-071-1/+4
| * | Merge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_act...David Baker2016-04-0725-190/+513
| |\ \
| * | | Remove code that's now been obsoleted or moved elsewhereDavid Baker2016-04-073-454/+9
| * | | Send badge count pushes.David Baker2016-04-074-24/+71
| * | | pep8David Baker2016-04-064-4/+8
| * | | Make pushers use the event_push_actions table instead of listening on an even...David Baker2016-04-0613-130/+503
* | | | PEP8Erik Johnston2016-04-111-1/+0
* | | | Merge pull request #688 from matrix-org/matthew/preview_urlsMatthew Hodgson2016-04-1110-9/+852
|\ \ \ \
| * | | | fix typos and needless try/except from PR reviewMatthew Hodgson2016-04-111-143/+140
| * | | | actually throw meaningful errorsMatthew Hodgson2016-04-082-14/+40
| * | | | Fix pep8 warningMark Haines2016-04-081-3/+4
| * | | | move local_media_repository_url_cache.sql to schema v31Matthew Hodgson2016-04-081-0/+0
| * | | | fix typoMatthew Hodgson2016-04-081-1/+1
| * | | | fix error checking for new SQLMatthew Hodgson2016-04-081-2/+2
| * | | | more PR feedbackMatthew Hodgson2016-04-081-4/+8
| * | | | fix SQL based on PR feedbackMatthew Hodgson2016-04-081-2/+4
| * | | | Add url_preview_enabled config option to turn on/off preview_url endpoint. de...Matthew Hodgson2016-04-086-31/+214
| * | | | Merge branch 'develop' into matthew/preview_urlsMatthew Hodgson2016-04-0733-388/+998
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into matthew/preview_urlsMatthew Hodgson2016-04-0437-992/+1463
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | report image size (bytewise) in OG metaMatthew Hodgson2016-04-031-0/+2
| * | | | | char encodingMatthew Hodgson2016-04-031-0/+1
| * | | | | pep8Matthew Hodgson2016-04-034-60/+85
| * | | | | fix etag typing error. fix timestamp typing errorMatthew Hodgson2016-04-031-2/+2
| * | | | | rebase all image URLsMatthew Hodgson2016-04-031-4/+4
| * | | | | remove stale todoMatthew Hodgson2016-04-031-3/+0
| * | | | | Ensure only one download for a given URL is active at a timeMatthew Hodgson2016-04-031-1/+18
| * | | | | add a persistent cache of URL lookups, and fix up the in-memory one to workMatthew Hodgson2016-04-034-14/+137
| * | | | | support gzip compression, and don't pass through error msgsMatthew Hodgson2016-04-022-5/+11
| * | | | | how was _respond_default_thumbnail ever meant to work?Matthew Hodgson2016-04-021-0/+2
| * | | | | pass back SVGs as their own thumbnailsMatthew Hodgson2016-04-021-0/+20
| * | | | | handle missing dimensions without crashingMatthew Hodgson2016-04-021-4/+13
| * | | | | make meta comparisons case insensitiveMatthew Hodgson2016-04-021-2/+2
| * | | | | refactor calc_og; spider image URLs; fix xpath; add a (broken) expiringcache;...Matthew Hodgson2016-04-021-81/+121
| * | | | | fix assorted redirect, unicode and screenscraping bugsMatthew Hodgson2016-04-011-78/+96
| * | | | | handle spidered relative images correctlyMatthew Hodgson2016-03-312-3/+13
| * | | | | prevent choking on invalid utf-8, and handle image thumbnailing smarterMatthew Hodgson2016-03-311-5/+18
| * | | | | synthesise basig OG metadata from pages lacking itMatthew Hodgson2016-03-311-0/+47
| * | | | | sync in changes from matrixfederationclientMatthew Hodgson2016-03-311-2/+6
| * | | | | handle requests with missing content-length headers (e.g. YouTube)Matthew Hodgson2016-03-312-9/+28
| * | | | | fix bugsMatthew Hodgson2016-03-291-5/+6
| * | | | | implement redirectsMatthew Hodgson2016-03-291-3/+3
| * | | | | debugMatthew Hodgson2016-03-291-3/+2
| * | | | | make it workMatthew Hodgson2016-03-293-56/+79
| * | | | | make it buildMatthew Hodgson2016-03-293-9/+11
| * | | | | Merge branch 'develop' into matthew/preview_urlsMatthew Hodgson2016-03-2929-319/+616
| |\ \ \ \ \
| | * | | | | typoMatthew Hodgson2016-03-291-1/+1
| * | | | | | Merge branch 'develop' into matthew/preview_urlsMatthew Hodgson2016-03-27143-4288/+6913
| |\ \ \ \ \ \
| | * | | | | | typoMatthew Hodgson2016-03-251-1/+1
| * | | | | | | initial WIP of a tentative preview_url endpoint - incomplete, untested, exper...Matthew Hodgson2016-01-244-1/+253
* | | | | | | | Merge pull request #677 from matrix-org/erikj/dns_cacheErik Johnston2016-04-081-17/+24
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cacheErik Johnston2016-04-0751-1236/+2026
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Allow clock to be passed in to funcErik Johnston2016-03-311-3/+3
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-30 20:53:25 +0000