Skip to content

Commit

Permalink
Merge branch 'release/2.17.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
jdelasoie committed Dec 9, 2020
2 parents 9e8fe65 + fd58c0d commit 919aa27
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# CHANGELOG

*2.17.2* (2020-12-09)
- Add link to legal footer

*2.17.1* (2020-11-25)
- Fix icons position #483

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.17.1
2.17.2
2 changes: 2 additions & 0 deletions assets/components/organisms/footer/footer-legal.twig
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<div class="footer-legal-links">
<a href="https://www.epfl.ch/about/overview/fr/reglements-et-directives/mentions-legales/">Accessibilité</a>
<a href="https://www.epfl.ch/about/overview/fr/reglements-et-directives/mentions-legales/">Mentions légales</a>
<a href="https://go.epfl.ch/protection-des-donnees/">Politique de protection des données</a>
</div>
<div>
<p>&copy; 2020 EPFL, tous droits réservés</p>
Expand All @@ -16,6 +17,7 @@
<div class="footer-legal-links">
<a href="https://www.epfl.ch/about/overview/regulations-and-guidelines/disclaimer/">Accessibility</a>
<a href="https://www.epfl.ch/about/overview/regulations-and-guidelines/disclaimer/">Disclaimer</a>
<a href="https://go.epfl.ch/privacy-policy/">Privacy policy</a>
</div>
<div>
<p>&copy; 2020 EPFL, all rights reserved</p>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "epfl-elements",
"version": "2.17.1",
"version": "2.17.2",
"license": "MIT",
"main": "index.html",
"repository": {
Expand Down

0 comments on commit 919aa27

Please sign in to comment.