xxxxMerge branch 'master' into hotfix (eab22561) · Commits · SciPost / SciPost · GitLab

SciPost Code Repository

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

SciPost
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

eab22561

Commit eab22561 authored 6 years ago by Jorran de Wit

Downloads
- Plain Diff

xxxxMerge branch 'master' into hotfix

parents 9b5d403f d9e3ec3a

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

finances/forms.py 2 additions, 1 deletion

finances/forms.py
finances/migrations/0008_subsidy_amount_publicly_shown.py 20 additions, 0 deletions

finances/migrations/0008_subsidy_amount_publicly_shown.py
finances/models.py 1 addition, 0 deletions

finances/models.py
finances/templates/finances/_subsidy_card.html 1 addition, 1 deletion

finances/templates/finances/_subsidy_card.html
finances/templates/finances/subsidy_list.html 1 addition, 1 deletion

finances/templates/finances/subsidy_list.html
finances/views.py 1 addition, 1 deletion

finances/views.py

with 26 additions and 4 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

SciPost Code Repository