diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-06 13:31:07 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-06 13:31:07 -0300 |
| commit | bbec7d72bed585d24f3d0d827b4911e30a887708 (patch) | |
| tree | 65c65beb5cf9e1992a993dd1ee8ac133f825653a /activerecord/activerecord.gemspec | |
| parent | a3bda38467377cb8c3cdd52b6fcf6c6c31f74b82 (diff) | |
| parent | 50d6b4549d56ac3a82f2096bd479a7b2305b0bf3 (diff) | |
| download | rails-bbec7d72bed585d24f3d0d827b4911e30a887708.tar.gz rails-bbec7d72bed585d24f3d0d827b4911e30a887708.tar.bz2 rails-bbec7d72bed585d24f3d0d827b4911e30a887708.zip | |
Merge branch '3-2-sec' into 3-2-stable
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'activerecord/activerecord.gemspec')
0 files changed, 0 insertions, 0 deletions