Merge remote-tracking branch 'upstream/master' into routing-merge
[rails.git] / app / views / layouts /
drwxr-xr-x   ..
-rw-r--r-- 521 _content.html.erb
-rw-r--r-- 497 _flash.html.erb
-rw-r--r-- 3049 _head.html.erb
-rw-r--r-- 4562 _header.html.erb
-rw-r--r-- 129 _inbox.html.erb
-rw-r--r-- 1639 _search.html.erb
-rw-r--r-- 2483 map.html.erb
-rw-r--r-- 458 site.html.erb
-rw-r--r-- 27 site.rss.builder
-rw-r--r-- 57 xhr.html.erb