Merge branch 'dev' into feature/new-tariffs

Browse Source

# Conflicts:
#	.gitignore
#	bot/app/web/subscription_webapp.py
#	tests/test_settings.py

...

This commit is contained in:

3252a8

2026-04-30 10:52:20 +03:00

parent 4958e1fdfd 4d0241a0ea

commit ce610b4804

39 changed files with 6813 additions and 8192 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

bot/app/web/subscription_webapp.py

+624 -207

File diff suppressed because it is too large Load Diff