Skip to content

Commit

Permalink
Merge branch 'release/1.2.25'
Browse files Browse the repository at this point in the history
  • Loading branch information
jdelasoie committed Jan 17, 2019
2 parents fd7e899 + 195e136 commit a1a13fb
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# CHANGELOG

*1.2.25* (2019-01-17)
- Update the english celebration link

*1.2.24* (2019-01-14)
- Add new logo for the 50 years (#164)
- Fix scienceqa form problem (#166)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.24
1.2.25
2 changes: 1 addition & 1 deletion header.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ private function _get_surrogate_menu () {
if ($language === 'fr') {
$celebration_url = 'https://www.epfl.ch/campus/events/fr/celebration/';
} else {
$celebration_url = 'https://www.epfl.ch/campus/events/celebration-3/';
$celebration_url = 'https://www.epfl.ch/campus/events/celebration-en/';
}
?>
<!doctype html>
Expand Down
2 changes: 1 addition & 1 deletion style.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Theme URI:
Author: Antistatique.net
Author URI: http://antistatique.net/
Description: Description
Version: 1.2.24
Version: 1.2.25
License: GNU General Public License v2 or later
License URI: LICENSE
Text Domain: epfl
Expand Down

0 comments on commit a1a13fb

Please sign in to comment.