Merge remote-tracking branch 'origin/114-migrate-to-materialize-css' into...
Merge remote-tracking branch 'origin/114-migrate-to-materialize-css' into 114-migrate-to-materialize-css # Conflicts: # biscuit/core/settings.py
No related branches found
No related tags found
Showing
- biscuit/core/cronjobs.py 0 additions, 18 deletionsbiscuit/core/cronjobs.py
- biscuit/core/menus.py 0 additions, 1 deletionbiscuit/core/menus.py
- biscuit/core/settings.py 4 additions, 9 deletionsbiscuit/core/settings.py
- biscuit/core/static/js/main.js 0 additions, 21 deletionsbiscuit/core/static/js/main.js
- biscuit/core/templates/core/person_card.html 0 additions, 21 deletionsbiscuit/core/templates/core/person_card.html
- biscuit/core/templates/core/system_status.html 0 additions, 19 deletionsbiscuit/core/templates/core/system_status.html
- biscuit/core/urls.py 2 additions, 3 deletionsbiscuit/core/urls.py
- biscuit/core/views.py 4 additions, 9 deletionsbiscuit/core/views.py
- dev.sh 2 additions, 1 deletiondev.sh
- docs/dev/01_setup.rst 1 addition, 1 deletiondocs/dev/01_setup.rst
- poetry.lock 63 additions, 97 deletionspoetry.lock
- pyproject.toml 4 additions, 6 deletionspyproject.toml
- tox.ini 3 additions, 4 deletionstox.ini
Loading
Please register or sign in to comment