Anthony 15b076fd20 fix merge conflicts		2021-08-19 22:18:54 +02:00
..
index.js	lint master	2021-07-05 10:02:03 -04:00
view.jsx	fix merge conflicts	2021-08-19 22:18:54 +02:00