Skip to content
Snippets Groups Projects
Commit a2b80560 authored by Luis Guzmán's avatar Luis Guzmán
Browse files

Merge branch 'master' into 'ayatana-settings' 

# Conflicts:
#   11.0/trisquel-meta/debian/changelog
#   11.0/trisquel-meta/debian/control
parents 3922b7f4 a3600367
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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