Jared Jacobson 84c8cb052b Merge branch 'master' into develop ... # Conflicts: # go.mod # go.sum		2021-09-03 13:54:05 +10:00
..
api	fedsender: try to satisfy all notary key requests from the cache first (#1925)	2021-07-16 11:35:42 +01:00
consumers	Cross-signing fixes, notifications via sync, federation (#1974)	2021-08-17 13:44:30 +01:00
internal	fedsender: try to satisfy all notary key requests from the cache first (#1925)	2021-07-16 11:35:42 +01:00
inthttp	fedsender: add cache tables for notary keys (#1923)	2021-07-15 17:45:37 +01:00
queue	Increase gocyclo complexity to 25 (and remove all but 2 golint directives related to it) (#1783)	2021-03-03 14:35:57 +00:00
statistics	Refactor backoff again (#1431)	2020-09-21 13:30:37 +01:00
storage	Merge branch 'master' into develop	2021-09-03 13:54:05 +10:00
types	Remove rooms table from federation sender (#1751)	2021-02-04 11:52:49 +00:00
federationsender.go	Allow clearing federation blacklist at startup for P2P demos	2021-05-24 11:43:24 +01:00