Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c78df3afc161b5ae358b7714503e7d05d00a0ffb..374fbc532c0f3a4f5cf0caa45d9855b1c23ea251 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,9 @@ nbproject
 \r
 #ignore things from transifex-client\r
 venv/\r
+\r
+#ignore git projects in vendor\r
+vendor/**/.git\r
+\r
+#ignore config files from JetBrains\r
+/.idea
\ No newline at end of file