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 /railties/lib | |
| 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 'railties/lib')
| -rw-r--r-- | railties/lib/rails/engine.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 579af8c6a5..93504b3b35 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -107,7 +107,7 @@ module Rails # # The <tt>Application</tt> class adds a couple more paths to this set. And as in your # <tt>Application</tt>, all folders under +app+ are automatically added to the load path. - # If you have an <tt>app/services/tt> folder for example, it will be added by default. + # If you have an <tt>app/services</tt> folder for example, it will be added by default. # # == Endpoint # |