Fix merge conflict
No related branches found
No related tags found
Showing
- journals/forms.py 16 additions, 0 deletionsjournals/forms.py
- journals/views.py 3 additions, 10 deletionsjournals/views.py
- partners/views.py 1 addition, 1 deletionpartners/views.py
- production/constants.py 1 addition, 0 deletionsproduction/constants.py
- production/migrations/0010_auto_20170707_0600.py 20 additions, 0 deletionsproduction/migrations/0010_auto_20170707_0600.py
- production/templates/production/_production_timesheet_card.html 30 additions, 0 deletions...tion/templates/production/_production_timesheet_card.html
- production/templates/production/production.html 136 additions, 10 deletionsproduction/templates/production/production.html
- production/views.py 12 additions, 0 deletionsproduction/views.py
- scipost/management/commands/add_groups_and_permissions.py 23 additions, 0 deletionsscipost/management/commands/add_groups_and_permissions.py
- scipost/templates/scipost/personal_page.html 37 additions, 34 deletionsscipost/templates/scipost/personal_page.html
- submissions/constants.py 6 additions, 8 deletionssubmissions/constants.py
Loading
Please register or sign in to comment