Lukas Heiligenbrunner e14d485a07 Merge branch 'master' into csstheming ... # Conflicts: # src/elements/PageTitle/PageTitle.module.css # src/elements/Preview/Preview.module.css # src/elements/SideBar/SideBar.module.css # src/index.css # src/pages/Player/Player.js # src/pages/Player/Player.module.css # src/pages/SettingsPage/SettingsPage.module.css		2020-08-05 22:55:03 +02:00
..
SideBar.js	correct naming of Generalinfos and added tests	2020-08-05 22:00:55 +02:00
SideBar.module.css	Merge branch 'master' into csstheming	2020-08-05 22:55:03 +02:00
SideBar.test.js	use enzyme library for testing updated some tests	2020-06-10 15:41:41 +02:00