summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-09-04 16:17:43 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-09-04 16:18:20 -0400
commit95c95a78f1d9cf00b7d706691cbee40ba4f21cf8 (patch)
treedd91c74fa59b9caf59af3acd30e95ea19fb8df37
parent5bdde8952cf10db2c9f172ade0febed453b7ed6f (diff)
webapp: Fixed visual glitch in xmpp pairing.
It seems that all other uses of <div .col-sm-9> occur outside of <div .content-box>. This one occurred inside it, when xmpp pairing. This was introduced in the bootstrap 3 conversion.
-rw-r--r--debian/changelog6
-rw-r--r--doc/bugs/Visual_glitch_while_xmpp_pairing.mdwn2
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2780807de..bc6668b0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (5.20140832) UNRELEASED; urgency=medium
+
+ * webapp: Fixed visual glitch in xmpp pairing.
+
+ -- Joey Hess <joeyh@debian.org> Thu, 04 Sep 2014 16:17:22 -0400
+
git-annex (5.20140831) unstable; urgency=medium
* Make --help work when not in a git repository. Closes: #758592
diff --git a/doc/bugs/Visual_glitch_while_xmpp_pairing.mdwn b/doc/bugs/Visual_glitch_while_xmpp_pairing.mdwn
index cf5e413f9..03b0a5350 100644
--- a/doc/bugs/Visual_glitch_while_xmpp_pairing.mdwn
+++ b/doc/bugs/Visual_glitch_while_xmpp_pairing.mdwn
@@ -10,3 +10,5 @@ Go to the pairing menu
### Please provide any additional information below.
![image of bug](http://i.imgur.com/fZe1ERD.png)
+
+> [[fixed|done]] --[[Joey]]