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