diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-26 12:41:52 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-26 12:41:52 -0300 |
| commit | c9bbea6115be520dbd47bd30108c5622289deb26 (patch) | |
| tree | ec418e01954c1bd2dcfebc7fbc8220fb04b50baf /.gitignore | |
| parent | ae1e0ac5e98a7e5a2894d0a431f8c34af6575cae (diff) | |
| parent | 86364591af807ed3fa4a7304f53e6f3458cb4961 (diff) | |
| download | rails-c9bbea6115be520dbd47bd30108c5622289deb26.tar.gz rails-c9bbea6115be520dbd47bd30108c5622289deb26.tar.bz2 rails-c9bbea6115be520dbd47bd30108c5622289deb26.zip | |
Merge commit 'brynary/master'
Conflicts:
lib/arel.rb
lib/arel/session.rb
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 2bab52ab21..c6dd721751 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ coverage/* config/database.yml +spec/fixtures/*database* *.DS_Store +debug.log |