diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-08-30 12:08:31 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-08-30 12:08:31 +0100 |
| commit | 6151099f5ba07d14a651aea8f816dd280d74209d (patch) | |
| tree | 4b014a2f4b198facc8bdd92c70b49fec2801d51a /.gitignore | |
| parent | merge: thunk the min/max promises (!603) (diff) | |
| parent | Merge pull request #14391 from misskey-dev/develop (diff) | |
| download | sharkey-6151099f5ba07d14a651aea8f816dd280d74209d.tar.gz sharkey-6151099f5ba07d14a651aea8f816dd280d74209d.tar.bz2 sharkey-6151099f5ba07d14a651aea8f816dd280d74209d.zip | |
Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.8
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 0aebf364bb..a8887eab92 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,8 @@ coverage !/.config/example.yml !/.config/docker_example.yml !/.config/docker_example.env +docker-compose.yml +compose.yml .devcontainer/compose.yml !/.devcontainer/compose.yml |