Spencer Ofwiti 36ec897bf1 Merge branch 'master' into spencer/linting ... # Conflicts: # package-lock.json # src/app/app.component.ts # src/app/app.module.ts # src/app/shared/shared.module.ts		2021-05-11 20:04:02 +03:00
..
icons	Add different manifest icons.	2021-05-11 19:52:49 +03:00
images	Add different manifest icons.	2021-05-11 19:52:49 +03:00
js	Format files with prettier.	2021-05-10 19:15:25 +03:00
.gitkeep	initial commit	2020-10-30 18:16:05 +03:00