mirror of
https://github.com/friendica/friendica
synced 2024-12-22 13:20:15 +00:00
Windows' CRLF are looking strange under Linux, let's get rid of them/
Also let's ignore addons/ as it is optional and depend on if the webmaster wants it or not. Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
parent
3868d830e7
commit
15c570495b
1 changed files with 0 additions and 3 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -56,7 +56,6 @@ venv/
|
|||
|
||||
#ignore all in 'vendor' as `utils/composer.phar install` will bring it back
|
||||
vendor/*
|
||||
<<<<<<< HEAD
|
||||
|
||||
#ignore config files from JetBrains
|
||||
/.idea
|
||||
|
@ -66,5 +65,3 @@ addons/
|
|||
|
||||
#Ignore .htaccess as it may contain local changes
|
||||
.htaccess
|
||||
=======
|
||||
>>>>>>> Fixes for composer:
|
||||
|
|
Loading…
Reference in a new issue