Merge remote-tracking branch 'origin/fast-api-rework' into fast-api-rework
# Conflicts: # old_src/activity.php # old_src/config.php # old_src/http.php # old_src/index.php # old_src/storage.php # old_src/streaks.php # old_src/templates.php
This commit is contained in:
commit
ec018a3f72