db inic
layouts
update
bundle update
bug in sites.css
routes remove subdomain for heroku
conflict in heroku
ok
conflicts
conflicts
conflicts
update top bar