Merge branch 'master' of /var/git/octomon into production (eb390ade) · Commits · FUSS / octomon · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

octomon
- Activity
- Members
- Labels
- Issues
  2
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

eb390ade

Commit eb390ade authored 6 years ago by root

Downloads
- Plain Diff

Merge branch 'master' of /var/git/octomon into production

parents 4379336c 6c3b1ccd

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

locale/de_DE/LC_MESSAGES/django.po 93 additions, 55 deletions

locale/de_DE/LC_MESSAGES/django.po
locale/it_IT/LC_MESSAGES/django.po 94 additions, 54 deletions

locale/it_IT/LC_MESSAGES/django.po
schools/forms.py 1 addition, 1 deletion

schools/forms.py
schools/models.py 10 additions, 10 deletions

schools/models.py
schools/templates/schools/create_other_hardware.html 17 additions, 4 deletions

schools/templates/schools/create_other_hardware.html
schools/templates/schools/other_hardware.html 16 additions, 2 deletions

schools/templates/schools/other_hardware.html
schools/templates/schools/scrapbook.html 2 additions, 2 deletions

schools/templates/schools/scrapbook.html
schools/urls.py 1 addition, 0 deletions

schools/urls.py
schools/views.py 37 additions, 6 deletions

schools/views.py

with 271 additions and 134 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