aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures
diff options
context:
space:
mode:
authorrick <rick@spacemonkey.local>2008-04-13 20:27:22 -0700
committerrick <rick@spacemonkey.local>2008-04-13 20:27:22 -0700
commit750e3217e13f385c5305e5ed9906703412e5667c (patch)
tree2809161ea3b98055165ff5f04b2e039ea01f1cc0 /actionpack/test/fixtures
parent420c4b3d8878156d04f45e47050ddc62ae00c68c (diff)
parent89237fe07e9c6d35687b3a473f09f4608a3625d8 (diff)
downloadrails-750e3217e13f385c5305e5ed9906703412e5667c.tar.gz
rails-750e3217e13f385c5305e5ed9906703412e5667c.tar.bz2
rails-750e3217e13f385c5305e5ed9906703412e5667c.zip
Merge commit 'stephencelis/master' into asset_shit
Diffstat (limited to 'actionpack/test/fixtures')
-rw-r--r--actionpack/test/fixtures/public/javascripts/version.1.0.js1
-rw-r--r--actionpack/test/fixtures/public/stylesheets/version.1.0.css1
2 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/public/javascripts/version.1.0.js b/actionpack/test/fixtures/public/javascripts/version.1.0.js
new file mode 100644
index 0000000000..cfd5fce70e
--- /dev/null
+++ b/actionpack/test/fixtures/public/javascripts/version.1.0.js
@@ -0,0 +1 @@
+// version.1.0 js \ No newline at end of file
diff --git a/actionpack/test/fixtures/public/stylesheets/version.1.0.css b/actionpack/test/fixtures/public/stylesheets/version.1.0.css
new file mode 100644
index 0000000000..30f5f9ba6e
--- /dev/null
+++ b/actionpack/test/fixtures/public/stylesheets/version.1.0.css
@@ -0,0 +1 @@
+/* version.1.0.css */ \ No newline at end of file