Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
# Conflicts:
#	airscore/templates/footer.html
  • Loading branch information
kuaka committed Jun 8, 2020
2 parents 7bdc332 + ec033f3 commit e1e76a6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion airscore/templates/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ul class="footer-nav">

<li>FAI Airscore v 0.1.1 <a href="{{ url_for('public.about') }}">About</a></li>
<li>FAI Airscore v 0.2.0 <a href="{{ url_for('public.about') }}">About</a></li>

<li>Contact <a href="mailto:[email protected]">Stuart</a> or <a href="[email protected]">Antonio</a></li>
</ul>
Expand Down

0 comments on commit e1e76a6

Please sign in to comment.