diff options
author | Evan Prodromou <evan@status.net> | 2009-10-28 17:24:53 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-10-28 17:24:53 -0400 |
commit | b73d6d18bae0e9046f65eb394c8e593de33f92a4 (patch) | |
tree | 981eb242aa4494b8c31604a59cac39116cb4ada4 /.gitignore | |
parent | 3c724ccd0df0d205a9567e435b6060300537f904 (diff) | |
parent | 10df75f9a074f2987b3525cd70a129bd26972ebb (diff) |
Merge branch '0.9.x' into location
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 1cde3a625..217622c84 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,4 @@ config-*.php good-config.php lac08.log php.log - +.DS_Store |