Jonas Schäfer f2c79044e0 Clean up post-merge lint ...

I am a *bit* sorry for this commit, because ideally this would've been
folded into 6d50b1c2c7 and whatever the
source of the other "conflict" was.

However, as the things have been merged in a batch, I can't do much more
than this.

2022-06-06 19:52:24 +02:00

..

scss

Add support for roles

2021-03-25 17:31:56 +01:00

static

Add account data import UI on registration success page

2022-01-17 16:24:00 +01:00

templates

Merge branch 'feature/export-back-button' into premerge

2022-06-06 19:46:43 +02:00

translations

Clean up post-merge lint

2022-06-06 19:52:24 +02:00

__init__.py

Merge branch 'fix/use-english-default' into premerge

2022-06-06 19:46:49 +02:00

_version.py

Automatically determine version from build info or git

2021-05-31 11:20:39 +01:00

admin.py

Merge branch 'feature/wtforms-3' into premerge

2022-06-06 19:46:32 +02:00

colour.py

…

infra.py

Clean up post-merge lint

2022-06-06 19:52:24 +02:00

invite.py

Bump quart to version 0.17

2022-05-30 17:37:54 +02:00

main.py

Clean up post-merge lint

2022-06-06 19:52:24 +02:00

prosodyclient.py

Bump quart to version 0.17

2022-05-30 17:37:54 +02:00

user.py

Merge branch 'feature/wtforms-3' into premerge

2022-06-06 19:46:32 +02:00

xmpputil.py

Bump quart to version 0.17

2022-05-30 17:37:54 +02:00