From 7525b8fefe68a0a8b0027832239912e00de029cb Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sun, 2 Apr 2017 21:29:06 +0200
Subject: [PATCH] Fixes for composer: - ./vendor/ is being prepared by
 executing `utils/composer.phar install`, no   need to have it around -
 converted .gitignore to LF line-ending (more common over the whole project) -
 no need to have them around ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 .gitignore | 117 +++++++++++++++++++++++++----------------------------
 1 file changed, 56 insertions(+), 61 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9e6504184c..ecfe4e73c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,61 +1,56 @@
-favicon.*
-.htconfig.php
-.htpreconfig.php
-\#*
-include/jquery-1.4.2.min.js
-*.log
-*.out
-*.version*
-favicon.*
-home.html
-addon
-*.orig
-*~
-robots.txt
-
-#ignore documentation, it should be newly built
-doc/html
-
-#ignore reports, should be generted with every build
-report/
-
-#ignore config files from eclipse, we don't want IDE files in our repository
-.project
-.buildpath
-.externalToolBuilders
-.settings
-#ignore OSX .DS_Store files
-.DS_Store
-
-/nbproject/private/
-
-#ignore smarty cache
-/view/smarty3/compiled/
-
-#ignore cache folders
-/privacy_image_cache/
-/photo/
-/proxy/
-nbproject
-
-#ignore vagrant dir
-.vagrant/
-
-#ignore local folder
-/local/
-
-#ignore config files from Visual Studio
-/.vs/
-/php_friendica.phpproj
-/php_friendica.sln
-/php_friendica.phpproj.user
-
-#ignore things from transifex-client
-venv/
-
-#ignore Composer dependencies
-/vendor
-/view/asset
-
-#ignore config files from JetBrains
-/.idea
+favicon.*
+.htconfig.php
+.htpreconfig.php
+\#*
+include/jquery-1.4.2.min.js
+*.log
+*.out
+*.version*
+favicon.*
+home.html
+addon
+*~
+robots.txt
+
+#ignore documentation, it should be newly built
+doc/html
+
+#ignore reports, should be generted with every build
+report/
+
+#ignore config files from eclipse, we don't want IDE files in our repository
+.project
+.buildpath
+.externalToolBuilders
+.settings
+#ignore OSX .DS_Store files
+.DS_Store
+
+/nbproject/private/
+
+#ignore smarty cache
+/view/smarty3/compiled/
+
+#ignore cache folders
+/privacy_image_cache/
+/photo/
+/proxy/
+nbproject
+
+#ignore vagrant dir
+.vagrant/
+
+#ignore local folder
+/local/
+
+#ignore config files from Visual Studio
+/.vs/
+/php_friendica.phpproj
+/php_friendica.sln
+/php_friendica.phpproj.user
+
+#ignore things from transifex-client
+venv/
+
+#ignore all in 'vendor' as `utils/composer.phar install` will bring it back
+vendor/*