Fixed merge fail - this branch doesn't have javascript_strings.
authorMatt Amos <zerebubuth@gmail.com>
Tue, 13 Oct 2009 14:36:15 +0000 (14:36 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Tue, 13 Oct 2009 14:36:15 +0000 (14:36 +0000)
commit2a7f689f1fdc4e24717a91ece1894e1401cae670
treec42fa1a5fe7d671c494fe1629d46ce7bf2c5d50c
parent42cdcce858e38418403aa4733837da4c3a62ff34
Fixed merge fail - this branch doesn't have javascript_strings.
app/views/layouts/site.html.erb