Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Public contract registry
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

520eee0c

Commit 520eee0c authored 2 years ago by Tomáš Valenta

Downloads
- Plain Diff

resolve conflict

parents 92a19d99 a5448de4

No related branches found

No related tags found

No related merge requests found

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

contracts/migrations/0002_contract_is_approved_alter_contract_valid_end_date.py 24 additions, 0 deletions

...002_contract_is_approved_alter_contract_valid_end_date.py
contracts/models.py 9 additions, 3 deletions

contracts/models.py
contracts/templates/contracts/index.html 1 addition, 1 deletion

contracts/templates/contracts/index.html
contracts/templates/contracts/view_contract.html 1 addition, 1 deletion

contracts/templates/contracts/view_contract.html
contracts/views.py 8 additions, 2 deletions

contracts/views.py

with 43 additions and 7 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

Pirátský GitLab - Home of the CopyLeft