diff options
| author | Evan Prodromou <evan@status.net> | 2009-10-28 14:21:51 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-10-28 14:21:51 -0400 |
| commit | 6c615f6801540d8b28cdc6d4ecf817943c11db34 (patch) | |
| tree | 86967dd32fcbad904cd06b866b2f7cd0e748343e /.gitignore | |
| parent | 7df082abb8f9570e55bac209068146e34b3781b4 (diff) | |
| parent | bf701b8235c22e648e44adfed8a9cb8e30cf9eab (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
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 |