Skip to content
GitLab
Commit f08bd886 authored by Tails developers's avatar Tails developers
Browse files

Fix buggy merge.

parent ca9a45e4
Hide whitespace changes
Inline Side-by-side
debian/changelog
View file @ f08bd886
tails (1.1) unstable; urgency=medium
<<<<<<< HEAD
=======
* Dummy entry for next release.
-- Tails developers <tails@boum.org> Tue, 29 Apr 2014 12:00:00 +0200
tails (1.0) unstable; urgency=medium
>>>>>>> origin/devel
* Security fixes
- Upgrade the web browser to 24.5.0esr-0+tails1~bpo60+1
......
Supports Markdown
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