kallithea Changeset - d0d386e51d06

Changeset - d0d386e51d06

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 2 0

Mads Kiilerich - 11 years ago 2015-05-03 22:08:22
madski@unity3d.com

Merge stable

2 files changed with 1 insertions and 2 deletions:

kallithea/public/css/style.css

kallithea/templates/admin/my_account/my_account_api_keys.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -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;

kallithea/templates/admin/my_account/my_account_api_keys.html

➞

Show inline comments

@@ @@ -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'))}

0 comments (0 inline, 0 general)