# Conflicts:
#   biscuit/core/templates/registration/login.html

Fix trailing whitespace and space before tab in indent

See merge request BiscuIT/BiscuIT-ng!83

mirabilos authored 5 years ago and mirabilos committed 5 years ago

(everywhere but in LICENCE which has a separate fixup branch;
keep docs/make.bat in CR-LF line endings)

Additionally change icon of admin menu entry

# Conflicts:
#	poetry.lock

Resolve "Add menu item for dbsettings"

Closes #123

See merge request BiscuIT/BiscuIT-ng!82

Additionally move all CSS to style.scss and remove unnecessary db settings

Merge remote-tracking branch 'origin/114-migrate-to-materialize-css' into 114-migrate-to-materialize-css

# Conflicts:
#	biscuit/core/settings.py

Remove bootstrap and some unnecessary stuff

Update dependency Pillow to v7

See merge request BiscuIT/BiscuIT-ng!81

This reverts commit 76d0193c.

Resolve "Remove cards and popovers for now"

Closes #121

See merge request BiscuIT/BiscuIT-ng!80

Resolve "Migrate to Django 3.0"

Closes #75

See merge request BiscuIT/BiscuIT-ng!79

Remove django-dbbackup for now.

See merge request BiscuIT/BiscuIT-ng!77

https://github.com/django-dbbackup/django-dbbackup/issues/314