Merge remote-tracking branch 'retspen/master'

Conflicts: conf/requirements.txt
2026-05-28 16:09:40 +00:00 · 2016-04-21 13:34:27 +02:00
parent 0e7c5c25b7 17cb7ace88
commit db1ab88f51
11 changed files with 456 additions and 415 deletions
--- a/instances/views.py
+++ b/instances/views.py
@@ -103,7 +103,7 @@ def instances(request):
                conn.start(name)
                addlogmsg(request.user.username, instance.name, msg)
                return HttpResponseRedirect(request.get_full_path())
-            
+
            if 'getvvfile' in request.POST:
                msg = _("Send console.vv file")
                addlogmsg(request.user.username, instance.name, msg)