Jens Langhammer aa6eacaf6b Merge branch 'master' into ui-improvements ...

# Conflicts:
#	passbook/static/static/package.json

2020-11-21 11:30:18 +01:00

..

static

Merge branch 'master' into ui-improvements

2020-11-21 11:30:18 +01:00

__init__.py

ui: fix branding viewport

2020-02-21 21:18:55 +01:00

apps.py

ui: fixup minor issues, add static app

2020-02-21 11:20:55 +01:00