Fixed merge fail - this branch doesn't have javascript_strings.
[rails.git] / app / views / diary_entry / view.html.erb
2009-06-09 Tom HughesMerge 15722:15806 from head and adjust new views to...
2009-06-09 Tom HughesRename views to rails 2 style names.