Updates application.html.haml
Updates application.html.haml
Merge branch 'master' into resource