Skip to content

Commit

Permalink
Merge branch 'main' into more-diversity-questions
Browse files Browse the repository at this point in the history
  • Loading branch information
russss authored Jun 9, 2024
2 parents 30051a9 + dc37d97 commit 6660bff
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions templates/home/after-event.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
in making things.{% endblock %} {% block body %}
<div class="row">
<div class="col-md-12 text-center hidden">
<h2>Electromagnetic Field 2016 is now over</h2>
<h2>Electromagnetic Field {{ event_year }} is now over</h2>
<div>&nbsp;</div>
</div>
<div class="col-md-12">
Expand All @@ -21,7 +21,7 @@ <h2>Electromagnetic Field 2016 is now over</h2>
</p>
<p>
If you want to re-live EMF, you can find photos, videos, and more on our
<a href="https://wiki.emfcamp.org/wiki/Memories">memories</a> page. Talk
<a href="https://wiki.emfcamp.org/{{ event_year }}/wiki/Memories">memories</a> page. Talk
videos will be published as soon as we can make them available.
</p>
<div class="well">
Expand Down
1 change: 1 addition & 0 deletions templates/sponsors/sponsors.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ <h3>Special Thanks</h3>
<a href="https://businessconnect.sky.com">Sky Connect</a>,
<a href="https://www.templant.co.uk/">Templant</a>,
<a href="https://multi-streamer.com/">Volkert Software</a>,
<a href="https://info-beamer.com">info-beamer</a>,
and everyone who volunteered.
</p>
</div>
Expand Down

0 comments on commit 6660bff

Please sign in to comment.