diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-05-14 10:48:43 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-05-14 10:48:43 -0700 |
commit | 9dcecbb080dca8e9525bcbc9a2d64ab4b417dd6d (patch) | |
tree | 0b8477543eea2f5e799f2bc91bfa88c3a1418c2a /.gitignore | |
parent | 73aefee3f23f54786c69f1bafa5b1f0b5aee8398 (diff) | |
parent | f93da579ce7f77dbd58b9a2165861aee265b8c93 (diff) | |
download | rails-9dcecbb080dca8e9525bcbc9a2d64ab4b417dd6d.tar.gz rails-9dcecbb080dca8e9525bcbc9a2d64ab4b417dd6d.tar.bz2 rails-9dcecbb080dca8e9525bcbc9a2d64ab4b417dd6d.zip |
Merge branch 'master' into normalizecb
* master:
private callback methods should work
Update mail to minimum version 2.5.4
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions