Fabian Dill 08ca4245c1 Merge branch 'main' into breaking_changes ...

# Conflicts:
#	Adjuster.py
#	AdjusterMain.py
#	BaseClasses.py
#	MultiClient.py
#	MultiServer.py
#	Mystery.py
#	Utils.py
#	WebHostLib/downloads.py
#	WebHostLib/generate.py
#	dumpSprites.py
#	test/TestBase.py
#	worlds/alttp/EntranceRandomizer.py
#	worlds/alttp/Main.py
#	worlds/alttp/Rom.py

2021-01-03 13:13:59 +01:00

..

api

fix attribute access in user api

2020-12-06 14:05:47 +01:00

static

use sortable table on Roll Results page

2020-12-19 19:36:23 +01:00

templates

Merge branch 'main' into breaking_changes

2021-01-03 13:13:59 +01:00

__init__.py

Merge branch 'main' into breaking_changes

2021-01-03 13:13:59 +01:00

autolauncher.py

Fix DB scheduling on mariaDB

2020-09-09 01:41:37 +02:00

check.py

Item Plando Support

2021-01-02 12:49:43 +01:00

customserver.py

Merge branch 'main' into breaking_changes

2021-01-03 13:13:59 +01:00

downloads.py

Revert "Revert "Merge branch 'pr/151'""

2020-12-04 23:52:03 +01:00

generate.py

Merge branch 'main' into breaking_changes

2021-01-03 13:13:59 +01:00

landing.py

update landing with dynamic links and counter for Seeds

2020-08-13 09:23:52 +02:00

models.py

Merge branch 'main' into breaking_changes

2021-01-03 13:13:59 +01:00

requirements.txt

Revert "Revert "Merge branch 'pr/151'""

2020-12-04 23:52:03 +01:00

tracker.py

Merge branch 'main' into breaking_changes

2021-01-03 13:13:59 +01:00

upload.py

Merge branch 'main' into breaking_changes

2021-01-03 13:13:59 +01:00