From: Ɓukasz Rekucki Date: Thu, 8 Oct 2009 12:48:38 +0000 (+0200) Subject: Merge branch 'master' of stigma:platforma X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/213b1af47b5f2c279db50304d318eb972289e3aa?hp=4dae2117bd399c1076973d325c6425e79fda1220 Merge branch 'master' of stigma:platforma --- diff --git a/fabfile.py b/fabfile.py index 39b95822..5f9cd3fe 100644 --- a/fabfile.py +++ b/fabfile.py @@ -1,3 +1,5 @@ +from __future__ import with_statement + from fabric.api import run, env, cd def staging(): diff --git a/project/static/js/models.js b/project/static/js/models.js index e2ee8b15..9a42bca1 100644 --- a/project/static/js/models.js +++ b/project/static/js/models.js @@ -224,7 +224,7 @@ Editor.HTMLModel = Editor.Model.extend({ $.ajax({ url: this.dataURL, - dataType: 'text; charset=utf-8', + dataType: 'text', data: { revision: this.get('revision'), part: path