diff options
author | Jean-Luc Gyger <jean-luc.gyger@vysual.ch> | 2016-02-11 10:01:12 +0100 |
---|---|---|
committer | Jean-Luc Gyger <jean-luc.gyger@vysual.ch> | 2016-02-11 10:01:12 +0100 |
commit | d70861a8f9368773f2f0291454e9420174e6c14a (patch) | |
tree | e44a32e401211422fb05da355c9eef4d5934d9e9 /.gitignore | |
parent | d32f65815eb6feb4bcb8a0c85572f722d7826342 (diff) | |
parent | 275f16b90a92c62935cb691d11e0bd124acf64e4 (diff) |
Merge branch 'master' of https://github.com/majuca/prado
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,4 @@ +/.buildpath /.idea atlassian-ide-plugin.xml /.project @@ -20,7 +21,8 @@ buildscripts/texbuilder/quickstart/quickstart.toc demos/quickstart/.cache demos/quickstart/.project demos/quickstart/.settings -demos/quickstart/index_pl.php +demos/blog/protected/Data/Blog.db +demos/chat/protected/App_Code/chat.db tests/FunctionalTests/results.dat tests/unit/Data/db/test.db @@ -28,9 +30,11 @@ tests/unit/Data/db/test.db vendor/* bin/phpunit bin/phing -bin/apigen.php +bin/apigen bin/coveralls -bin/dbunit.php +bin/dbunit +bin/jsonlint +bin/validate-json #OSX .DS_Store |