Merge branch 'master' of ssh://gitlab.warpzone.ms:444/infrastruktur/warpinfra (bf23763e) · Commits · Sebastian / warpinfra · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

W

warpinfra
- Activity
- Members
- Labels

Snippets Groups Projects

bf23763e

Commit bf23763e authored 8 years ago by void

Downloads
- Plain Diff

Merge branch 'master' of ssh://gitlab.warpzone.ms:444/infrastruktur/warpinfra

parents ab8827c5 71ee8a68

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

README.md 0 additions, 2 deletions

README.md
www/web/locale/de/LC_MESSAGES/django.po 58 additions, 20 deletions

www/web/locale/de/LC_MESSAGES/django.po
www/web/locale/en/LC_MESSAGES/django.po 49 additions, 11 deletions

www/web/locale/en/LC_MESSAGES/django.po
www/web/templates/base.html 25 additions, 5 deletions

www/web/templates/base.html
www/web/warpauth/models.py 4 additions, 6 deletions

www/web/warpauth/models.py
www/web/warpauth/views/register.py 1 addition, 1 deletion

www/web/warpauth/views/register.py
www/web/warpfood/templates/warpfood/view.html 1 addition, 1 deletion

www/web/warpfood/templates/warpfood/view.html
www/web/warpfood/views.py 12 additions, 2 deletions

www/web/warpfood/views.py
www/web/warpzone/settings.py 3 additions, 3 deletions

www/web/warpzone/settings.py

with 153 additions and 51 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