Merge tag 'v6.74' into develop

release
2018-05-27 10:54:01 +02:00
parent b5f0f41b41 3818f83cf1
commit 7ae1e1603a
2 changed files with 4 additions and 2 deletions
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -13668,6 +13668,8 @@ def virtualevent_create_view(request):
            # create Site Announcement & Tweet
            if settings.DEBUG:
                dotweet = False
+            elif 'dev' in settings.SITE_URL:
+                dotweet = False
            else:
                dotweet = True
            sa = SiteAnnouncement(
--- a/templates/basebase.html
+++ b/templates/basebase.html
@@ -227,11 +227,11 @@
 	  {% endif %}
 	</div>
        <div class="grid_1 tooltip">
-          {% block teams %}
+          {% block challenges %}
          {% endblock %}
        </div>
        <div class="grid_1 tooltip">
-          {% block challenges %}
+          {% block teams %}
          {% endblock %}
        </div>
      </div>