diff options
author | Sarven Capadisli <csarven@controlyourself.ca> | 2009-08-04 15:53:15 +0000 |
---|---|---|
committer | Sarven Capadisli <csarven@controlyourself.ca> | 2009-08-04 15:53:15 +0000 |
commit | d0a020dd4ea8d58bc8230ebcde22e54ad31894a8 (patch) | |
tree | c7d14f1e09bd46c72e577ca54645a7bab4a747e7 /.gitignore | |
parent | 5f3af3e121a7ff06f5961bb4158e0b777ce5b5c1 (diff) | |
parent | ffa1d662a759a729151f2444bdf759749d59045e (diff) |
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index f4c2bba5f..5394f5eac 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,4 @@ config-*.php good-config.php lac08.log php.log -config.php.* + |