summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-03-22 17:08:56 +0000
committerintrigeri <intrigeri@boum.org>2015-03-22 17:08:56 +0000
commit334e1c485a3a79be9fff899d4dc9d2db89cdc9e1 (patch)
tree25445d3296baf7d9140710fe5a3a34208a56ccf3
parent7685d6ac19fd40e7300032a3ee42e57331a4cdc0 (diff)
parentb4f374158ce3118ba29dbcb5e749fe9d05057654 (diff)
Merge remote-tracking branch 'origin/master' into stable1.3.1
-rw-r--r--wiki/src/blueprint/monthly_meeting.mdwn1
1 files changed, 1 insertions, 0 deletions
diff --git a/wiki/src/blueprint/monthly_meeting.mdwn b/wiki/src/blueprint/monthly_meeting.mdwn
index 127eb35..761c1de 100644
--- a/wiki/src/blueprint/monthly_meeting.mdwn
+++ b/wiki/src/blueprint/monthly_meeting.mdwn
@@ -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?