Merge: changes from 'upstream/main' & conflict resolution

Conflict in the lockfile resolved by re-locking the merged Pipfile.

Conflict in Branding constants resolved by keeping my local version.
Change in the cog's target branch to 'main' from 'master' is currently
irrelevant as we targets a development branch anyway.

1 files changed, 0 insertions, 1 deletions

diff --git a/Pipfile b/Pipfile
index 56ece7611..86add29cb 100644
--- a/Pipfile
+++ b/Pipfile
@@ -29,7 +29,6 @@ sphinx = "~=2.2"
 statsd = "~=3.3"
 arrow = "~=0.17"
 emoji = "~=0.6"
-python-json-logger = "~=2.0"
 
 [dev-packages]
 coverage = "~=5.0"