Merge branch 'develop' into 'production'

Update .gitignore See merge request taobojlen/fediverse.space!45
2019-02-27 09:26:28 +00:00 · 2019-02-27 09:26:28 +00:00 · 82b016a6a1
parent c7b5c862f1 b55485d7b8
commit 82b016a6a1
1 changed files with 2 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1,9 @@
 *.csv
 .idea/
 backend/backend/static/
+backend/static/
 *.gexf
-backend/backend/whitelist.txt
+backend/whitelist.txt
 data/

 # Byte-compiled / optimized / DLL files