Fixed merge fail - this branch doesn't have javascript_strings.
[rails.git] / app / views / way_tag /
drwxr-xr-x   ..
-rw-r--r-- 706 search.html.erb