Files @ 5f7e5ee1bd82
Branch filter:

Location: symposion_app/static/src/pyconau2017/css/stylesheets/ie.css

Nick Seidenman (N6)
Merge branch 'master' into prod

Conflicts:
fixtures/conference.json
fixtures/sites.json
/* line 1, ../sass/ie.scss */
.banner {
  background: none;
  background: white url("../../img/banner.png") no-repeat 50% 50%;
}

/* line 6, ../sass/ie.scss */
.internal-banner {
  background-color: #fefefe;
}