Skip to content
Snippets Groups Projects
Commit 61439c81 authored by azubieta's avatar azubieta
Browse files

Merge branch 'development' into 'add_timestamps_to_appimages' 

# Conflicts:
#   pkg/appimage/appimagebuild
parents 347fdb9e e41fc432
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 10 additions and 14 deletions
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