# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2015-05-03 22:08:22
# Node ID d0d386e51d06f81a24c69e6d57c41b2080c9ef7a
# Parent  b5e399286ce50f2daf791b154653a536431a0205
# Parent  85a6526a15a88ab0ad7c5392d3ca033ec3d8808a

Merge stable

diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css
--- a/kallithea/public/css/style.css
+++ b/kallithea/public/css/style.css
@@ -4793,7 +4793,6 @@ div.diffblock {
 }
 div.diffblock.margined {
     margin: 0px 20px 0px 20px;
-    overflow: hidden;
 }
 div.diffblock .code-header {
     border-bottom: 1px solid #CCCCCC;
diff --git a/kallithea/templates/admin/my_account/my_account_api_keys.html b/kallithea/templates/admin/my_account/my_account_api_keys.html
--- a/kallithea/templates/admin/my_account/my_account_api_keys.html
+++ b/kallithea/templates/admin/my_account/my_account_api_keys.html
@@ -58,7 +58,7 @@
         <div class="fields">
              <div class="field">
                 <div class="label">
-                    <label for="new_email">${_('New api key')}:</label>
+                    <label for="description">${_('New api key')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('description', class_='medium', placeholder=_('Description'))}