From: Tom Hughes Date: Tue, 13 Oct 2009 20:06:24 +0000 (+0000) Subject: Merged 17256:18123 from trunk. X-Git-Tag: live~6563^2~7 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ef40b61ff40881966ae4280cfdcb9f92965e9d10 Merged 17256:18123 from trunk. --- ef40b61ff40881966ae4280cfdcb9f92965e9d10 diff --cc app/views/layouts/site.html.erb index f072544aa,1e4e56e6a..d1983a9f0 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@@ -1,7 -1,7 +1,8 @@@ + + <%= javascript_strings %> <%= javascript_include_tag 'prototype' %> <%= javascript_include_tag 'site' %>