Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
tails
Commits
f08bd886
Commit
f08bd886
authored
May 02, 2014
by
Tails developers
Browse files
Fix buggy merge.
parent
ca9a45e4
Changes
1
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.0
esr
-
0
+
tails1
~
bpo60
+
1
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment