Merge branch 'develop' of https://e.coding.net/ctcdevteam/ehs/ehs_server into develop

2022-04-26 23:37:50 +08:00 · 2022-04-26 23:37:50 +08:00 · 0f411279de
parent 81ed03cb24 8f9f32601e
commit 0f411279de
1 changed files with 2 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,4 +13,5 @@ celerybeat-schedule.dat
 celerybeat-schedule.dir
 db.sqlite3
 server/conf.py
-sh/*
+sh/*
+nohup.out