2017-04-02 15:29:06 -04:00
|
|
|
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
|
2018-05-02 16:26:24 -04:00
|
|
|
|
2017-04-02 15:29:06 -04:00
|
|
|
#ignore OSX .DS_Store files
|
|
|
|
|
.DS_Store
|
|
|
|
|
|
2018-05-02 16:26:24 -04:00
|
|
|
#ignore NetBeans IDE's private files (at least)
|
2017-04-02 15:29:06 -04:00
|
|
|
/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/*
|
2017-04-02 15:29:06 -04:00
|
|
|
<<<<<<< HEAD
|
2017-07-26 16:16:29 -04:00
|
|
|
|
|
|
|
|
#ignore config files from JetBrains
|
|
|
|
|
/.idea
|
|
|
|
|
|
|
|
|
|
#ignore addons/ directory
|
|
|
|
|
addons/
|
2018-05-02 16:26:24 -04:00
|
|
|
|
|
|
|
|
#Ignore .htaccess as it may contain local changes
|
|
|
|
|
.htaccess
|
2017-04-02 15:29:06 -04:00
|
|
|
=======
|
|
|
|
|
>>>>>>> Fixes for composer:
|
