Merge branch '6661-gitignore-update' into 'develop'

Re-add patch excludes

Closes #6661

See merge request ispconfig/ispconfig3!1863

Author: Till Brehm

.gitignore

@@ -1,7 +1,11 @@
 .idea
 /nbproject/private/
 .phplint-cache
+
+# Vim and patch specific excludes
 *.swp
+*.orig
+*.rej
 
 # macOS-specific things to exclude