Skip to content

Conversation

@joshglazer
Copy link
Member

Description

Fixing merge conflicts to master

Related PRs

List related PRs against other branches:

branch PR
other_pr_description #

Todos

  • Tests
  • Documentation

Deploy Notes

Notes regarding deployment the contained body of work.

Steps to Test or Reproduce

Outline the steps to test or reproduce the PR here.

commands to test PR

Impacted Areas in Application

List general components of the application that this PR will affect:

stoopidJSON and others added 30 commits September 10, 2020 08:56
With this change we will send a different email to ALF's than to everyone
else.
resolves CodeForBaltimore#268
…ton/issue-268

Adding Assisted Living email template
…grade-1b63e0aaef66fc8e8f724a328a73a0e5

[Snyk] Upgrade snyk from 1.381.2 to 1.398.0
…grade-e953cc700fb5a4f8456d3033e7807631

[Snyk] Upgrade @babel/core from 7.11.1 to 7.11.6
…grade-dce214ab436dd01744b731ce2c8ae9f4

[Snyk] Upgrade json2csv from 5.0.1 to 5.0.3
…/docker_improvements

Updates Dockerfile, docker-compose, and corresponding documentation.
…x-1bb1eddff12762205f6ebbb146514919

[Snyk] Security upgrade nodemailer from 6.4.11 to 6.4.16
Changed bad link in DevIntro and removed redudant README file to please mkdocs, avoid warnings and prevent build failure.
…n/issue-311

Fixed source of mkdocs warnings
blakenan-bellese and others added 2 commits November 19, 2020 13:33
…x-2571a30466b115e84407521ad215b509

[Snyk] Security upgrade mocha from 7.2.0 to 8.2.0
@joshglazer joshglazer merged commit 0460a9b into CodeForBaltimore:188 Nov 20, 2020
@joshglazer joshglazer deleted the 188 branch November 20, 2020 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants