Merge branch 'master' into cms/docs/about/resume

bgoonz · May 16, 2022 · d5f4ab5 · d5f4ab5
2 parents 1ce80c6 + eb4ae15
commit d5f4ab5
Show file tree

Hide file tree

Showing 12 changed files with 381 additions and 917 deletions.
diff --git a/src/pages/docs/career/about/eng-portfolio.md → src/pages/docs/about/eng-portfolio.md b/src/pages/docs/career/about/eng-portfolio.md → src/pages/docs/about/eng-portfolio.md
diff --git a/src/pages/docs/career/about/index.md → src/pages/docs/about/index.md b/src/pages/docs/career/about/index.md → src/pages/docs/about/index.md
diff --git a/src/pages/docs/career/about/internal-use.md → src/pages/docs/about/internal-use.md b/src/pages/docs/career/about/internal-use.md → src/pages/docs/about/internal-use.md
diff --git a/src/pages/docs/career/about/intrests.md → src/pages/docs/about/intrests.md b/src/pages/docs/career/about/intrests.md → src/pages/docs/about/intrests.md
diff --git a/src/pages/docs/career/about/job-search.md → src/pages/docs/about/job-search.md b/src/pages/docs/career/about/job-search.md → src/pages/docs/about/job-search.md
diff --git a/src/pages/docs/career/about/readme.md → src/pages/docs/about/readme.md b/src/pages/docs/career/about/readme.md → src/pages/docs/about/readme.md
diff --git a/src/pages/docs/career/about/resume.md → src/pages/docs/about/resume.md b/src/pages/docs/career/about/resume.md → src/pages/docs/about/resume.md
diff --git a/src/sass/imports/_docs.scss b/src/sass/imports/_docs.scss
diff --git a/src/sass/imports/_general.scss b/src/sass/imports/_general.scss
diff --git a/static/images/9b4ada4a-3329-4756-abc6-6076e39b99dd.jpeg b/static/images/9b4ada4a-3329-4756-abc6-6076e39b99dd.jpeg
diff --git a/...9b4ada4a-3328-4756-abc6-6076e39b99dd.jpeg → static/images/git-merge.jpeg b/...9b4ada4a-3328-4756-abc6-6076e39b99dd.jpeg → static/images/git-merge.jpeg
diff --git a/.../51fcf6a1-c47e-4723-9334-ebae7f47ed2e.png → static/images/html2.png b/.../51fcf6a1-c47e-4723-9334-ebae7f47ed2e.png → static/images/html2.png