Jennifer Richards c0c8771370 Merge branch 'main' into main-merge ... # Conflicts: # .devcontainer/docker-compose.extend.yml # .github/workflows/build-test-base.yml # .github/workflows/build.yml # README.md # docker/app.Dockerfile # docker/configs/settings_local.py # docker/docker-compose.extend.yml # docker/scripts/app-init.sh # ietf/release/tests.py # ietf/release/urls.py # ietf/templates/500.html # ietf/templates/api/index.html # ietf/templates/base.html # ietf/templates/base/menu.html # ietf/templates/group/group_about_status_edit.html # ietf/templates/meeting/agenda_filter.html # ietf/templates/release/about.html # ietf/utils/tests.py # package-lock.json		2022-03-25 11:15:05 -03:00
..
menu.html	Merge branch 'main' into main-merge	2022-03-25 11:15:05 -03:00
menu_active_groups.html	Hopefully the final check-ins.	2022-02-08 17:29:15 +00:00
menu_user.html	Hopefully the final check-ins.	2022-02-08 17:29:15 +00:00
menu_wg.html	Hopefully the final check-ins.	2022-02-08 17:29:15 +00:00