Merge pull request #5478 from rschamp/rearrange-conference-2021

Fix integration test broken in #5476

test/integration/footer-links.test.js

@@ -139,7 +139,7 @@ describe('www-integration footer links', () => {
         await clickText('Scratch Conference');
         let url = await driver.getCurrentUrl();
         let pathname = (new URL(url)).pathname;
-        expect(pathname).toMatch(/^\/conference\/2020\/?$/);
+        expect(pathname).toMatch(/^\/conference\/2021\/?$/);
     });
 
 });