Commit 9696c810 authored by Raphaël Hertzog's avatar Raphaël Hertzog

Merge branch 'upstream'

This merges the deletion of the debian directory in the upstream branch
while not changing anything in the content of the master branch where
we have our own debian dir.
parents d68bcf31 0e7cb6cc
Markdown is supported
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