Skip to content
Snippets Groups Projects
Verified Commit 0a7abb5e authored by azubieta's avatar azubieta
Browse files

Merge branch 'master' of www.opencode.net:dfn2/pling-store into rename_to_pling_store 

 Conflicts:
	pkg/appimage/appimagebuild
parents f2b46dc0 8d37093d
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