diff options
| author | José Valim <jose.valim@gmail.com> | 2012-05-20 14:01:52 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-05-20 23:40:26 +0200 |
| commit | 74c4e7ba342d6450b25763652ec0266494a56458 (patch) | |
| tree | d9bd6fa539d1c9361a816e93eb9f5f434b6a1538 /actionmailer | |
| parent | a78ee05da102b85f45ecc1a6f230817430fe2aea (diff) | |
| download | rails-74c4e7ba342d6450b25763652ec0266494a56458.tar.gz rails-74c4e7ba342d6450b25763652ec0266494a56458.tar.bz2 rails-74c4e7ba342d6450b25763652ec0266494a56458.zip | |
Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614c
Template concurrency fixes
Conflicts:
actionpack/lib/action_view/template.rb
Diffstat (limited to 'actionmailer')
0 files changed, 0 insertions, 0 deletions