diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-06-30 20:12:17 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-06-30 20:12:17 -0300 |
| commit | e5b8c4483c8de805d5847563edcf4e5d7e035a87 (patch) | |
| tree | 00f579d40ce23c5ebb0a3386ca5c00d22406bbd6 /railties/test/initializer/root/app/views | |
| parent | 9c70442534c7754eac3738e0ddf11446b01c4f9e (diff) | |
| parent | db3de78a83379ab2a58e0d29fb10622b813a4d44 (diff) | |
| download | rails-e5b8c4483c8de805d5847563edcf4e5d7e035a87.tar.gz rails-e5b8c4483c8de805d5847563edcf4e5d7e035a87.tar.bz2 rails-e5b8c4483c8de805d5847563edcf4e5d7e035a87.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/base.rb
Diffstat (limited to 'railties/test/initializer/root/app/views')
| -rw-r--r-- | railties/test/initializer/root/app/views/.keep | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/railties/test/initializer/root/app/views/.keep b/railties/test/initializer/root/app/views/.keep new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/railties/test/initializer/root/app/views/.keep |