datatracker/dev
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
..
deploy ci: call "parcel build" to package static assets 2022-03-09 15:45:32 -04:00
docker-test-base ci: build improvements + skip tests option 2022-03-23 14:59:56 -04:00
legacy chore: move hold-for-merge + ready-for-merge into dev/legacy 2022-03-23 18:10:42 -04:00
tests ci: build improvements + skip tests option 2022-03-23 14:59:56 -04:00
INSTALL chore: remove deprecated files + add excluded patterns for deploy (#3589) 2022-03-08 08:20:52 -06:00