diff options
author | Erik Johnston <erik@matrix.org> | 2022-09-23 10:43:06 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2022-09-23 10:43:06 +0100 |
commit | c9316f9f767282a99f57739340bb58f6e121710c (patch) | |
tree | 26825da350f6e8a047ac498b0ba89a631052df6e /.gitignore | |
parent | Raise issue if complement fails with latest deps (#13859) (diff) | |
parent | Move warnings up (diff) | |
download | synapse-c9316f9f767282a99f57739340bb58f6e121710c.tar.xz |
Merge branch 'release-v1.68' into develop
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 31a60bb7bd..15fbfdddf1 100644 --- a/.gitignore +++ b/.gitignore @@ -15,8 +15,9 @@ _trial_temp*/ .DS_Store __pycache__/ -# We do want the poetry lockfile. +# We do want the poetry and cargo lockfile. !poetry.lock +!Cargo.lock # stuff that is likely to exist when you run a server locally /*.db |