Skip to content
Snippets Groups Projects
Commit 43bba018 authored by azubieta's avatar azubieta
Browse files

Merge branch 'master' into 'push_to_release' 

# Conflicts:
#   README.md
#   package-lock.json
#   package.json
#   pkg/appimage/appimagebuild
parents 1bbe7878 9c04dc7b
No related branches found
No related tags found
Checking pipeline status
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