Skip to content
Snippets Groups Projects
Verified Commit 35d33e33 authored by Griefed's avatar Griefed :joystick:
Browse files

Merge branch 'renovate-electron-19.x' of https://git.griefed.de/prosper/docker-template-repo 

# Conflicts:
#	frontend/package-lock.json
#	frontend/package.json
parents 60df8be3 f3f4e6ff
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Me haz all ze repositoriiiiiiiiiiiiiiiiiies