Merged updates from trunk into stable branch

[feedcatcher.git] / vendor / rails / actionpack / test / fixtures / layouts / xhr.html.erb

diff --git a/vendor/rails/actionpack/test/fixtures/layouts/xhr.html.erb b/vendor/rails/actionpack/test/fixtures/layouts/xhr.html.erb
new file mode 100644 (file)
index 0000000..8528532
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/layouts/xhr.html.erb
@@ -0,0 +1,2 @@
+XHR!
+<%= yield %>
\ No newline at end of file