anhefti 3afed86efa Merge remote-tracking branch 'origin/dev-1.2-gui-testing' into ... development Conflicts: src/main/java/ch/ethz/seb/sebserver/gui/table/TableFilter.java src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java		2022-01-26 09:32:11 +01:00
..
main	Merge remote-tracking branch 'origin/dev-1.2-gui-testing' into	2022-01-26 09:32:11 +01:00
test	refactored downloads	2022-01-20 14:41:12 +01:00