Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

F

flask-covid19
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

b97a5251

Commit b97a5251 authored 4 years ago by thomaswoehlke

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	src/covid19/blueprints/owid/owid_model_import.py

parents 18e5f98e 3d6a20da

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

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 deletions

src/covid19/blueprints/owid/owid_views.py
src/covid19/static/vendor/fontawesome-free/package.json 2 additions, 2 deletions

src/covid19/static/vendor/fontawesome-free/package.json

with 14 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment