diff options
| author |  kwzrd <[email protected]> | 2021-03-28 14:53:16 +0200 |
|---|---|---|
| committer | kwzrd <[email protected]> | 2021-03-28 14:53:16 +0200 |
| commit | 4b1e90feab0cb6fc1eef708b709d1d2ed25ddbdc (patch) | |
| tree | e041f7bb680414356bfba11be4d9ffc318c1d253 /Dockerfile | |
| parent | Branding: add contextual message to #changelog notifications (diff) | |
| parent | Merge pull request #1466 from vcokltfre/discord-tags (diff) | |
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.
Diffstat (limited to 'Dockerfile')
0 files changed, 0 insertions, 0 deletions