diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-20 15:51:51 -0700 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-20 15:51:51 -0700 |
commit | 5b96523c239609c97012834ec92e8162d868c9f7 (patch) | |
tree | 29813551ca22c37c90866c81ab51bcb164e2ee10 | |
parent | 198afa0a1d61c4db2cf6b66e5801af506462ab9b (diff) | |
parent | 27aaabb5f2829d983bcedb6b637558ba143b718b (diff) |
Merge branch '0.8.x' into cmdline
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 8a7f5c65c..f4c2bba5f 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ config-*.php good-config.php lac08.log php.log +config.php.* |