Merge pull request #4701 from tobiasd/20180328-msg

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index cd299f2d859153ebc7169fe30918a5cdd4b14568..8d86b95875c44d3b384f3f98bce53ee9e8ad2d2a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -52,5 +52,9 @@ nbproject
 #ignore things from transifex-client\r
 venv/\r
 \r
-#ignore git projects in vendor\r
-vendor/**/.git\r
+#ignore Composer dependencies\r
+/vendor\r
+/view/asset\r
+\r
+#ignore config files from JetBrains\r
+/.idea
\ No newline at end of file