Merge branch 'treenode_editor' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into treenode_editor

4 years ago · 90db059725
3 changed files with 3 additions and 3 deletions
--- a/data/sitetree_new.json
+++ b/data/sitetree_new.json
--- a/mamweb/settings_local.py
+++ b/mamweb/settings_local.py
@ -28,7 +28,7 @@ INTERNAL_IPS = ['127.0.0.1']

 TEMPLATES[0]['OPTIONS']['debug'] = True

-ALLOWED_HOSTS = ['127.0.0.1']
+ALLOWED_HOSTS = ['127.0.0.1', '192.168.43.34']

 # Database
 # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
--- a/seminar/templates/seminar/profil/nahraj_reseni.html
+++ b/seminar/templates/seminar/profil/nahraj_reseni.html
@ -53,7 +53,7 @@
              </td>
              <td {% if field.help_text %} class="field-with-comment"{% endif %}>
                {{ field }}
-                  <span class="field-comment">{{ field.help_text|safe }}</span>>
+                  <span class="field-comment">{{ field.help_text|safe }}</span>
              </td>

            <td><span class="field-error">{{ field.errors }}</span></td>