diff options
author | Timo Kösters <timo@koesters.xyz> | 2021-09-15 20:31:21 +0000 |
---|---|---|
committer | Timo Kösters <timo@koesters.xyz> | 2021-09-15 20:31:21 +0000 |
commit | 47f326339674ce79d1a2a20e5306ba80ca847ed1 (patch) | |
tree | 712dc1c012f198d04d2458466f2542b83b8c197c /conduit-example.toml | |
parent | 34fa7fee055d83b108ed06ef85a70f719bbe7774 (diff) | |
parent | d38f9b5f0186b2e36d72296e6b842e1b36fbe75a (diff) | |
download | conduit-47f326339674ce79d1a2a20e5306ba80ca847ed1.zip |
Merge branch 'gwmngilfen-next-patch-21674' into 'next'
Add two flavours of change for the mautrix-signal patch
See merge request famedly/conduit!197
Diffstat (limited to 'conduit-example.toml')
0 files changed, 0 insertions, 0 deletions