Felix Hamme 3df9f44c92 Merge remote-tracking branch 'origin/master' into ticket/TURNIERE-148 ... # Conflicts: # js/api.js # pages/tournament.js		2019-06-19 16:39:48 +02:00
..
components	Merge remote-tracking branch 'origin/master' into ticket/TURNIERE-148	2019-06-19 16:39:48 +02:00
redux	Merge remote-tracking branch 'origin/master' into ticket/TURNIERE-148	2019-06-19 16:39:48 +02:00
utils	Adjust the StandingsTable to the new API data format	2019-05-29 04:24:39 +02:00
api.js	Merge branch 'master' into ticket/TURNIERE-236	2019-06-18 21:27:26 +02:00
constants.js	Automatically apply eslint rules	2019-05-09 14:48:43 +02:00