Skip to content
Snippets Groups Projects
Commit 535a3651 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'master' into release 

Conflicts:

	debian/rules
parents c767a3f9 9b8f13db
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 4 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