diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-09 14:19:43 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-09 14:19:43 -0800 |
| commit | 2af5303683f729bb1a4eb582a023276b8a0db402 (patch) | |
| tree | cca196e03e151220461a307c6eb559b08fa0f832 /actionpack | |
| parent | b0acc77edced44e47c8570bf7dddd4ce19f06cb0 (diff) | |
| parent | da65fe9e11b7f445847228753e6df46d376e29ab (diff) | |
| download | rails-2af5303683f729bb1a4eb582a023276b8a0db402.tar.gz rails-2af5303683f729bb1a4eb582a023276b8a0db402.tar.bz2 rails-2af5303683f729bb1a4eb582a023276b8a0db402.zip | |
Merge branch 'master' into ruby-2.2
* master:
Revert "ask the fixture set for the sql statements"
Diffstat (limited to 'actionpack')
0 files changed, 0 insertions, 0 deletions