Alexander Tseung ef61ef2ce8 Fix i18n merge conflicts		2018-03-29 09:37:29 -07:00
..
index.js	i18n redux solution doesn't require importing t() and passing state to each t() call; t is just available on props.	2018-03-21 22:11:47 -02:30