Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Maják
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

f471bef2

Commit f471bef2 authored 2 years ago by Štěpán Farka Committed by jan.bednarik 2 years ago

Downloads
- Patches
- Plain Diff

[FIX] conflict migrations

parent 2b883b87

No related branches found

No related tags found

2 merge requests!550Release,!542[ADD] footer person list

Changes 4

Expand all Show whitespace changes

Inline Side-by-side

Showing

district/migrations/0083_districthomepage_footer_person_list.py 3 additions, 2 deletions

...ct/migrations/0083_districthomepage_footer_person_list.py
district/migrations/0084_auto_20220601_1118.py 2 additions, 2 deletions

district/migrations/0084_auto_20220601_1118.py
district/migrations/0085_alter_districtcenterpage_sidebar_content_and_more.py 356 additions, 182 deletions

...0085_alter_districtcenterpage_sidebar_content_and_more.py
district/migrations/0086_alter_districtcontactpage_contact_people.py 2 additions, 2 deletions

...grations/0086_alter_districtcontactpage_contact_people.py

with 363 additions and 188 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