conflict resolvedwq
Showing
- babel.cfg 1 addition, 0 deletionsbabel.cfg
- docs/week4.md 2 additions, 2 deletionsdocs/week4.md
- docs/week5.md 43 additions, 0 deletionsdocs/week5.md
- src/tjts5901/backend/item_api.py 2 additions, 0 deletionssrc/tjts5901/backend/item_api.py
- src/tjts5901/frontend/styles/img/sv_SE.png 0 additions, 0 deletionssrc/tjts5901/frontend/styles/img/sv_SE.png
- src/tjts5901/frontend/styles/style.css 14 additions, 1 deletionsrc/tjts5901/frontend/styles/style.css
- src/tjts5901/i18n.py 2 additions, 2 deletionssrc/tjts5901/i18n.py
- src/tjts5901/items.py 2 additions, 2 deletionssrc/tjts5901/items.py
- src/tjts5901/templates/auction.html 19 additions, 14 deletionssrc/tjts5901/templates/auction.html
- src/tjts5901/templates/auth/register.html 4 additions, 4 deletionssrc/tjts5901/templates/auth/register.html
- src/tjts5901/templates/base.html 2 additions, 2 deletionssrc/tjts5901/templates/base.html
- src/tjts5901/templates/index.html.j2 20 additions, 21 deletionssrc/tjts5901/templates/index.html.j2
- src/tjts5901/translations/fi_FI/LC_MESSAGES/messages.po 175 additions, 17 deletionssrc/tjts5901/translations/fi_FI/LC_MESSAGES/messages.po
- src/tjts5901/translations/sv_SE/LC_MESSAGES/messages.po 412 additions, 0 deletionssrc/tjts5901/translations/sv_SE/LC_MESSAGES/messages.po
- tests/test_smoke.py 0 additions, 11 deletionstests/test_smoke.py
Loading
Please register or sign in to comment