Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fancy_graph
# Conflicts: # src/statistics/FancyGraphCard.tsx # src/statistics/components/DatasetPickerCard.tsx # src/statistics/fancy_graph_entry.tsx # tapir/statistics/views/fancy_graph/base_view.py # tapir/statistics/views/fancy_graph/number_of_abcd_members_view.py # tapir/statistics/views/fancy_graph/number_of_active_members_view.py # tapir/statistics/views/fancy_graph/number_of_co_purchasers_view.py # tapir/statistics/views/fancy_graph/number_of_created_resignations_view.py # tapir/statistics/views/fancy_graph/number_of_exempted_members_view.py # tapir/statistics/views/fancy_graph/number_of_flying_members_view.py # tapir/statistics/views/fancy_graph/number_of_frozen_members_view.py # tapir/statistics/views/fancy_graph/number_of_investing_members_view.py # tapir/statistics/views/fancy_graph/number_of_long_term_frozen_members_view.py # tapir/statistics/views/fancy_graph/number_of_members_view.py # tapir/statistics/views/fancy_graph/number_of_paused_members_view.py # tapir/statistics/views/fancy_graph/number_of_pending_resignations_view.py # tapir/statistics/views/fancy_graph/number_of_purchasing_members_view.py # tapir/statistics/views/fancy_graph/number_of_shift_partners_view.py # tapir/statistics/views/fancy_graph/number_of_working_members_view.py
- Loading branch information