Merge pull request #4701 from tobiasd/20180328-msg

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 77151060d22b03c5add2627e2a6c558f2a0a4d15..8d86b95875c44d3b384f3f98bce53ee9e8ad2d2a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -43,15 +43,18 @@ nbproject
 #ignore local folder\r
 /local/\r
 \r
-#other stuff\r
-.directory\r
-.gitignore\r
-\r
-/view/theme/Friendiboot\r
-/view/theme/Viereinhalb\r
-/view/theme/blog\r
-/view/theme/boheme\r
-/view/theme/clean\r
-/view/theme/suckerberg\r
-\r
-/addon/frio_hovercard\r
+#ignore config files from Visual Studio\r
+/.vs/\r
+/php_friendica.phpproj\r
+/php_friendica.sln\r
+/php_friendica.phpproj.user\r
+\r
+#ignore things from transifex-client\r
+venv/\r
+\r
+#ignore Composer dependencies\r
+/vendor\r
+/view/asset\r
+\r
+#ignore config files from JetBrains\r
+/.idea
\ No newline at end of file