MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Windows' CRLF are looking strange under Linux, let's get rid of them/

Browse source 
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:
Roland Häder 2017-07-26 22:16:29 +02:00
parent 3868d830e7
commit 15c570495b
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -56,7 +56,6 @@ venv/
#ignore all in 'vendor' as `utils/composer.phar install` will bring it back #ignore all in 'vendor' as `utils/composer.phar install` will bring it back
vendor/* vendor/*
<<<<<<< HEAD
#ignore config files from JetBrains #ignore config files from JetBrains
/.idea /.idea
@ -66,5 +65,3 @@ addons/
#Ignore .htaccess as it may contain local changes #Ignore .htaccess as it may contain local changes
.htaccess .htaccess
=======
>>>>>>> Fixes for composer: