summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute/meetings/201408.mdwn
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2017-02-07 01:46:02 +0000
committerintrigeri <intrigeri@boum.org>2017-02-07 01:46:02 +0000
commita125665e9ca875c16465f014c3cafe002eef1572 (patch)
tree375e19d545131856a70684c5fce29bb415eb299b /wiki/src/contribute/meetings/201408.mdwn
parent0bab7e30681f7b481f5967d38686770460533b4c (diff)
parent4bb09f3837bd8864afd085e69654cd497690fe70 (diff)
Merge remote-tracking branch 'origin/devel' into feature/tor-nightly-master
Diffstat (limited to 'wiki/src/contribute/meetings/201408.mdwn')
-rw-r--r--wiki/src/contribute/meetings/201408.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/wiki/src/contribute/meetings/201408.mdwn b/wiki/src/contribute/meetings/201408.mdwn
index ace0e78..c219eba 100644
--- a/wiki/src/contribute/meetings/201408.mdwn
+++ b/wiki/src/contribute/meetings/201408.mdwn
@@ -68,7 +68,7 @@ Press enquiries
=======================================================================================================================
- Three people (sajolida, jvoisin, and intrigeri) were convinced by anonym's
- [comment #2](https://labs.riseup.net/code/issues/7380#note-2) and agreed
+ [[!tails_ticket 7380#note-2 desc="comment 2"]] and agreed
with rejecting.
- Furthermore as anonym said, we might not want to change how Tails behaves
when opting-out of MAC spoofing, so it would turn the MAC option into a