I think i have successfully merged origin/master into eric_config_parser, seems fine

2022-07-30 21:36:16 +02:00
parent 665623c7ee 36868afa30
commit 2d91b704c3
18 changed files with 1192 additions and 49 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 Thumbs.db
 *.o
+*.d
 *.swp
 *.out
 *.exe
@@ -17,3 +18,5 @@ builds
 ubuntu_tester
 ubuntu_cgi_tester
 webserv
+!**/webserv/
+*.log