CopyleftConf/copyleftconf-website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into prod

Browse source
This commit is contained in:
Christopher Neugebauer 2017-08-18 12:34:18 -07:00
commit 3a361be67b
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pinaxcon/templates/static_pages/about/team.html
View file

@ -56,7 +56,7 @@ Our team of North Bay and Bay Area locals has years of experience building commu
<ul>
<li><a href="https://twitter.com/vavroom">Nicolas Steenhout</a> is helping us with accessibility and inclusion of people with disabilities.</li>
<li><a href="https://twitter.com/vmbrasseur">VM (Vicky) Brasseur</a> is helping us run an excellent call for proposals, design our office hours program, and support new speakers with speaker training.</li>
<li><a href="https://twitter.com/sigje">Jen Davis</a> is helping us make the event accessible to parents by advising on things like childcare.</li>
<li><a href="https://twitter.com/sigje">Jennifer Davis</a> is helping us make the event accessible to parents by advising on things like childcare.</li>
</ul>

4
static/scss/custom.scss
View file

@ -391,3 +391,7 @@ footer .footer-copy {
background-color: $gray-lighter;
font-size: 10px;
}
body.login #content_body .row > div.col-md-9 > p + div.container {
padding-left: 0px;
}