mirror of
https://github.com/friendica/friendica
synced 2024-12-27 11:22:20 +00:00
355c42cb30
Conflicts: include/config.php update.php
23 lines
358 B
Text
23 lines
358 B
Text
favicon.*
|
|
.htconfig.php
|
|
\#*
|
|
include/jquery-1.4.2.min.js
|
|
*.log
|
|
*.out
|
|
*.version*
|
|
favicon.*
|
|
home.html
|
|
addon
|
|
*~
|
|
|
|
#ignore documentation, it should be newly built
|
|
doc/api
|
|
|
|
#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
|