Merge branch 'master' of github.com:LLK/scratch-www into hotfix/totally-normal-2020

# Conflicts: # package-lock.json # package.json

Merge branch 'master' of github.com:LLK/scratch-www into hotfix/totally-normal-2020
# Conflicts: # package-lock.json # package.json
b189e04e · rschamp · 7a9e24e0 · 127bfff7 · b189e04e · b189e04e
Commit b189e04e authored Mar 26, 2020 by rschamp
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 155 additions and 43 deletions

src/views/teachers/faq/faq.jsx src/views/teachers/faq/faq.jsx +118 -22

src/views/teachers/faq/l10n.json src/views/teachers/faq/l10n.json +37 -21

No files found.
--- a/src/views/teachers/faq/faq.jsx
+++ b/src/views/teachers/faq/faq.jsx
--- a/src/views/teachers/faq/l10n.json
+++ b/src/views/teachers/faq/l10n.json