слияние веток master и adminpanel_backend

1 year ago · 3698ce9d9e
1 changed files with 5 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,6 +7,11 @@ bot.db
 adminpanelapp/migrations
 __init__.py
 .env
+<<<<<<< HEAD
 =======
 tmp.py
 >>>>>>> 46ad1a6aefd07c5f411d1921fa7145d938b56dd8
+=======
+.idea/
+venv/
+>>>>>>> f39b738d22a536bddc60ea3016319ce06869a670