CopyleftConf/copyleftconf-website Changeset - 3a361be67b20

Changeset - 3a361be67b20

Parent rev.

Child rev.

[Not reviewed]

Merge

0 2 0

Christopher Neugebauer - 7 years ago 2017-08-18 19:34:18
chrisjrn@gmail.com

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

2 files changed with 5 insertions and 1 deletions:

pinaxcon/templates/static_pages/about/team.html

static/scss/custom.scss

0 comments (0 inline, 0 general)

pinaxcon/templates/static_pages/about/team.html

➞

Show inline comments

@@ ... @@
   <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>

static/scss/custom.scss

➞

Show inline comments

@@ ... / @@ -393 +393,5 @@ footer .footer-copy { @@
+}
 body.login #content_body .row > div.col-md-9 > p + div.container {
   padding-left: 0px;
+}

0 comments (0 inline, 0 general)