summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-06-09 19:00:55 +0000
committerintrigeri <intrigeri@boum.org>2016-06-09 19:00:55 +0000
commit384b3622d21ad658da65cb23a233caba4e099378 (patch)
tree53442252573245711afc05541507315fda4f3e4e
parent602795d221875d642a5378dfda609bdf6984f85a (diff)
parent6db364fe8b6fbffda7f12318108cace2c86d9848 (diff)
Merge remote-tracking branch 'origin/devel' into feature/10779-start-haveged-earlierfeature/10779-start-haveged-earlier
-rw-r--r--config/base_branch2
-rw-r--r--debian/changelog12
2 files changed, 13 insertions, 1 deletions
diff --git a/config/base_branch b/config/base_branch
index 2bf5ad0..d64531f 100644
--- a/config/base_branch
+++ b/config/base_branch
@@ -1 +1 @@
-stable
+devel
diff --git a/debian/changelog b/debian/changelog
index 6d85eab..19b3b36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tails (2.6) UNRELEASED; urgency=medium
+
+ * Dummy entry.
+
+ -- anonym <anonym@riseup.net> Tue, 07 Jun 2016 09:07:40 +0200
+
+tails (2.5) UNRELEASED; urgency=medium
+
+ * Dummy entry.
+
+ -- anonym <anonym@riseup.net> Tue, 07 Jun 2016 09:07:40 +0200
+
tails (2.4.1) UNRELEASED; urgency=medium
* Dummy entry.