diff options
| author | Diego Magdaleno <diegomagdaleno@protonmail.com> | 2021-05-23 13:11:52 -0500 |
|---|---|---|
| committer | Diego Magdaleno <diegomagdaleno@protonmail.com> | 2021-05-23 13:11:52 -0500 |
| commit | 0b90d567c2951518ed0b4ec90edf64f32719cc83 (patch) | |
| tree | 786ee33f6cbd1330f6d5032786880fe6a9a5487c /Dockerfile | |
| parent | Docker: Remove the .docker directory and that goes in the main fosscord repo (diff) | |
| parent | Merge pull request #146 from luth31/upstream (diff) | |
| download | server-ts-0b90d567c2951518ed0b4ec90edf64f32719cc83.tar.xz | |
Meta: fix merge issues
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile |