diff options
| author | Evan Prodromou <evan@status.net> | 2009-11-01 13:04:23 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-11-01 13:04:23 -0500 |
| commit | 5f5413624d166a9b2116d266c7698dd6dcd2d8c4 (patch) | |
| tree | 3f7f85bbfb747d68bf518df026eea6ac686ad0c0 /.gitignore | |
| parent | 658683e240ef6e44c6450a16448fe7cb82f792f2 (diff) | |
| parent | 44ce8e2fcd1eba0d0f2723c246c1a021614e2763 (diff) | |
Merge branch '0.9.x' into userflag
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 |