diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-03-30 15:46:14 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-03-30 15:46:14 +0530 |
| commit | 6d8c070821bc846eb263b8c045ae652ebd751569 (patch) | |
| tree | 414dcf7d7a9a5885235b0426e545bd21b994091d /activesupport/test/notifications_test.rb | |
| parent | 022ed6c763d91e1bb032150fc7ec5991141f8119 (diff) | |
| parent | 6bd1bbe7cf87ae2b4764e0ed0d5b583bd026af8a (diff) | |
| download | rails-6d8c070821bc846eb263b8c045ae652ebd751569.tar.gz rails-6d8c070821bc846eb263b8c045ae652ebd751569.tar.bz2 rails-6d8c070821bc846eb263b8c045ae652ebd751569.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
activerecord/test/cases/adapter_test.rb
guides/source/testing.md
[ci skip]
Diffstat (limited to 'activesupport/test/notifications_test.rb')
0 files changed, 0 insertions, 0 deletions