Commit 334e1c48 authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/master' into stable

parents 7685d6ac b4f37415
......@@ -16,3 +16,4 @@ Discussions
===========
- [[!tails_ticket 5613 desc="Document time sync failure"]]: Is it really needed?
- [[!tails_ticket 9047 desc="Tails trademark"]]: do we agree on this?
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