diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-08-03 22:47:57 +0000 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-08-03 22:47:57 +0000 |
| commit | dccd4aa68d7ae449434c63380f21d8070913778f (patch) | |
| tree | 1a25d40f20326047eb0776f910e155362e8e33cb /.gitignore | |
| parent | 981fa1b33a8073bd0d53d8bee7dfccd171685e61 (diff) | |
| parent | ff6e976d0315c57fc5b7e31845e9a3bad4f095bc (diff) | |
Merge branch '0.8.x' into twitter-oauth
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.* + |