diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-11-17 22:47:23 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-11-17 22:47:23 +0000 |
| commit | 5446d5cb05b50a9a3f317ded774be438e0eff909 (patch) | |
| tree | 6b0b87efe3e95783763208215a3159fb63217a6d /.gitmodules | |
| parent | 9754debb9a72f9385950e5282f3642b995ab76d8 (diff) | |
| parent | f8877d4b2a2a6f68770b376f0b1391a6295f62f2 (diff) | |
| download | rails-5446d5cb05b50a9a3f317ded774be438e0eff909.tar.gz rails-5446d5cb05b50a9a3f317ded774be438e0eff909.tar.bz2 rails-5446d5cb05b50a9a3f317ded774be438e0eff909.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
activesupport/lib/active_support/core_ext/hash/conversions.rb
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index e69de29bb2..20ed3ed9c9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "arel"] + path = arel + url = git://github.com/rails/arel.git +[submodule "rack-mount"] + path = rack-mount + url = git://github.com/rails/rack-mount.git |