Merge branch 'develop' into feature.diff-whitespace
This commit is contained in:
commit
fef2bd15bf
19
.gitignore
vendored
19
.gitignore
vendored
@ -1,14 +1,19 @@
|
||||
*~
|
||||
tmp
|
||||
.buildpath
|
||||
.externalToolBuilders
|
||||
.project
|
||||
.settings
|
||||
.tx/config
|
||||
attachments
|
||||
indefero-*.zip
|
||||
src/IDF/conf/idf.php
|
||||
src/IDF/conf/idf.test.php
|
||||
www/test.php
|
||||
www/media/upload
|
||||
src/IDF/gettexttemplates
|
||||
indefero-*.zip
|
||||
src/IDF/conf/path.php
|
||||
.tx/config
|
||||
src/IDF/gettexttemplates
|
||||
src/IDF/locale/idf.pot.bak
|
||||
test/config.php
|
||||
test/test.db
|
||||
test/tmp
|
||||
test/config.php
|
||||
tmp
|
||||
www/media/upload
|
||||
www/test.php
|
||||
|
Loading…
Reference in New Issue
Block a user