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>

diff --git a/.gitignore b/.gitignore
index 9e6504184c03c4347f630441b34c0fc8e133c13c..ecfe4e73c974485c0710de44520ce7b8541a3c0c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,61 +1,56 @@
-favicon.*\r
-.htconfig.php\r
-.htpreconfig.php\r
-\#*\r
-include/jquery-1.4.2.min.js\r
-*.log\r
-*.out\r
-*.version*\r
-favicon.*\r
-home.html\r
-addon\r
-*.orig\r
-*~\r
-robots.txt\r
-\r
-#ignore documentation, it should be newly built\r
-doc/html\r
-\r
-#ignore reports, should be generted with every build\r
-report/\r
-\r
-#ignore config files from eclipse, we don't want IDE files in our repository\r
-.project\r
-.buildpath\r
-.externalToolBuilders\r
-.settings\r
-#ignore OSX .DS_Store files\r
-.DS_Store\r
-\r
-/nbproject/private/\r
-\r
-#ignore smarty cache\r
-/view/smarty3/compiled/\r
-\r
-#ignore cache folders\r
-/privacy_image_cache/\r
-/photo/\r
-/proxy/\r
-nbproject\r
-\r
-#ignore vagrant dir\r
-.vagrant/\r
-\r
-#ignore local folder\r
-/local/\r
-\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\r
+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/*