Juan Picado @jotadeveloper e9b881b979 Merge remote-tracking branch 'origin/4.x-master' into 89-fix-incorrect-logos-style ... # Conflicts: # src/components/Login/__snapshots__/Login.test.tsx.snap		2019-07-10 07:57:53 +02:00
..
App	fix: remove token from AppState	2019-07-09 21:00:59 +01:00
components	Merge remote-tracking branch 'origin/4.x-master' into 89-fix-incorrect-logos-style	2019-07-10 07:57:53 +02:00
icons	feat: migrating flow to typescript (#47)	2019-06-20 14:37:28 +02:00
pages	refactor: update global styles using emotion	2019-07-07 13:27:56 +01:00
styles	refactor: remove scss files	2019-07-07 13:27:57 +01:00
template	feat: migrating flow to typescript (#47)	2019-06-20 14:37:28 +02:00
utils	Merge branch '4.x-master' into refactor/78_replace-node-sass-with-emotion	2019-07-09 13:52:25 +02:00
history.ts	feat: migrating flow to typescript (#47)	2019-06-20 14:37:28 +02:00
index.tsx	fix: @typescript-eslint/explicit-function-return-type	2019-06-24 23:08:57 +01:00
router.tsx	fix: @typescript-eslint/no-explicit-any	2019-06-26 00:10:15 +01:00