diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-12-11 00:55:25 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-12-11 00:55:25 +0100 |
| commit | c6612d2bb34e7104a7b1be0dedb0e1ad9596f160 (patch) | |
| tree | 1c3bde09706831c3913614fbc8a69a223a924aca /railties/lib/rails/application.rb | |
| parent | e07772556a2167e44158f367beb3a45e6a55671f (diff) | |
| parent | d38644f4a9eead2f9d9ed96e10fb67430de31789 (diff) | |
| download | rails-c6612d2bb34e7104a7b1be0dedb0e1ad9596f160.tar.gz rails-c6612d2bb34e7104a7b1be0dedb0e1ad9596f160.tar.bz2 rails-c6612d2bb34e7104a7b1be0dedb0e1ad9596f160.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
activerecord/lib/active_record/transactions.rb
Diffstat (limited to 'railties/lib/rails/application.rb')
0 files changed, 0 insertions, 0 deletions