01b02dbcaa
Conflicts: include/text.php view/templates/head.tpl view/theme/duepuntozero/style.css view/theme/vier/style.css
44 lines
669 B
Text
44 lines
669 B
Text
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/
|