diff --git a/hold-for-merge b/hold-for-merge index 247f355a5..fa8d7a0e5 100644 --- a/hold-for-merge +++ b/hold-for-merge @@ -1,5 +1,9 @@ # -*- conf-mode -*- +personal/lars/6.0.5.dev0@9732 # Already fixed in a different merge +personal/lars/6.0.5.dev0@9731 # Jquery update; wait with this to the CDN branch comes in +personal/lars/6.0.5.dev0@9730 # Jquery update; wait with this to the CDN branch comes in +personal/lars/6.0.5.dev0@9729 # Jquery update; wait with this to the CDN branch comes in personal/rjs/v6.0.4.dev0@9647 # Commit contained too much. Later corrected commit will be marked for merge personal/rcross/v5.7.3-dev0@8640 # Rework: make the check_permissions() decorator handle the case where the user isn't logged in personal/rcross/v5.6.3-dev0@8237 # Includes other merges; merge personal/rcross/v5.6.2-dev0@8216 instead diff --git a/ietf/templates/base.html b/ietf/templates/base.html index c84f06389..7f11dd367 100644 --- a/ietf/templates/base.html +++ b/ietf/templates/base.html @@ -41,7 +41,7 @@ {% with debug_server_mode="production" %} -