Skip to content
Snippets Groups Projects
Commit 66e9bc4e authored by Yann Leboulanger's avatar Yann Leboulanger
Browse files

Merge branch 'master' into 'gnotification' 

# Conflicts:
#   gajim/gajim.py
parents 083e3017 28184273
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 849 additions and 1820 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