diff options
| author | Bryan Helmkamp <bryan@brynary.com> | 2009-09-20 12:00:39 -0400 |
|---|---|---|
| committer | Bryan Helmkamp <bryan@brynary.com> | 2009-09-20 12:00:39 -0400 |
| commit | 58920bc508a533d02140f4df3db25c3b9e1c7597 (patch) | |
| tree | a27fcdd77290be44d495c4ff145df94fd130c9fa /.gitmodules | |
| parent | 724b48620c5cf21920717d66eea6e7cd4148b535 (diff) | |
| parent | 8852db7087a8f4f98e5fd26fa33bac14a5400979 (diff) | |
| download | rails-58920bc508a533d02140f4df3db25c3b9e1c7597.tar.gz rails-58920bc508a533d02140f4df3db25c3b9e1c7597.tar.bz2 rails-58920bc508a533d02140f4df3db25c3b9e1c7597.zip | |
Merge remote branch 'miloops/master' into miloops
Conflicts:
spec/connections/mysql_connection.rb
spec/connections/postgresql_connection.rb
spec/connections/sqlite3_connection.rb
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..5f43dd3ae5 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "vendor/rails"] + path = vendor/rails + url = git://github.com/rails/rails.git |