annotate .svn/pristine/18/18cc4e49160ae0034ae73ed153f32f0bc91339cb.svn-base @ 1459:cf78a7ade302
luisf
Merge from branch "bug_794"
| author |
luisf <luis.figueira@eecs.qmul.ac.uk> |
| date |
Mon, 11 Nov 2013 18:25:50 +0000 |
| parents |
cbb26bc654de |
| children |
|
| rev |
line source |
|
Chris@909
|
1 <%= image_tag 'image.png', :plugin => 'test_assets' %>
|
|
Chris@909
|
2 <%= javascript_include_tag 'file.1.js', 'file2', :plugin => "test_assets" %>
|
|
Chris@909
|
3 <%= stylesheet_link_tag 'file.1.css', 'file2', :plugin => "test_assets" %>
|
|
Chris@909
|
4 <%= image_submit_tag 'image.png', :plugin => "test_assets" %>
|
