Merge remote-tracking branch 'origin/main' into main
# Conflicts: # src/covid19/blueprints/owid/owid_model_import.py
No related branches found
No related tags found
Showing
- .gitignore 5 additions, 0 deletions.gitignore
- src/covid19/blueprints/application/templates/application/fragments/fragment_navbar.html 4 additions, 0 deletions...tion/templates/application/fragments/fragment_navbar.html
- src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html 1 addition, 1 deletion...ion/templates/application/fragments/fragment_navtabs.html
- src/covid19/blueprints/owid/owid_views.py 2 additions, 2 deletionssrc/covid19/blueprints/owid/owid_views.py
- src/covid19/static/vendor/fontawesome-free/package.json 2 additions, 2 deletionssrc/covid19/static/vendor/fontawesome-free/package.json
Please register or sign in to comment