diff options
| author |  Mark Pemberton | 2011-05-21 21:38:25 -0400 |
|---|---|---|
| committer | Mark Pemberton | 2011-05-21 21:38:25 -0400 |
| commit | b105867e75f103ae2b0c54edfaa9ce6467a8a258 (patch) | |
| tree | 299bd99f271a55a98de88e8b27e457ea8401d2f1 /.gitignore | |
| parent | e0149e24e2b5fac3b875fda468b18fbe2b6b1218 (diff) | |
| parent | 97bba97049eeed2ecec022caa641b50ca507cb72 (diff) | |
| download | scuttle-b105867e75f103ae2b0c54edfaa9ce6467a8a258.tar.gz scuttle-b105867e75f103ae2b0c54edfaa9ce6467a8a258.zip | |
Merge branch 'master' into privatekey2
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -3,4 +3,6 @@ dist/ build.properties package.xml semanticscuttle-dump.sql -data/config.unittest.php +data/config.php +data/config.testing.php +data/config.testing-tmp.php |