Merge branch 'deploy' of ssh://tea.entar.net:2222/teh/mastodon into deploy

I added a swap file here. Don't ask.
2025-02-02 19:57:11 -08:00 · 2024-07-04 11:41:59 -07:00 · 2024-07-04 09:05:31 -07:00
2 changed files with 3 additions and 0 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -23,3 +23,4 @@ chart
 backup.*
 clutter
 .*.pgdump
+6gbswapfile
--- a/.gitignore
+++ b/.gitignore
@ -69,6 +69,8 @@ yarn-debug.log

 # Ignore Docker option files
 docker-compose.override.yml
+phanpy
+6gbswapfile

 # Ignore dotenv .local files
 .env*.local
Author	SHA1	Message	Date
Erik Stambaugh	de67f096f9	Merge branch 'deploy' of ssh://tea.entar.net:2222/teh/mastodon into deploy	2025-02-02 19:57:11 -08:00
Erik Stambaugh	979079c774	Merge branch 'deploy' of ssh://tea.entar.net:2222/teh/mastodon into deploy	2024-07-04 11:41:59 -07:00
Erik Stambaugh	62967ae462	I added a swap file here. Don't ask.	2024-07-04 09:05:31 -07:00