diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
| commit | 7924c43af9044cfd40f36bd8a84378417223d95b (patch) | |
| tree | 78197ea5c36baaff4fcc1a53580eb3d586630b39 /ishtar_common/tests.py | |
| parent | 54b87741a26a2bd805ed32200b082ca07ee0e27d (diff) | |
| parent | 0bdaa7c90017b436b3baf026c9710a8d49c9420a (diff) | |
| download | Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.tar.bz2 Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.zip | |
Merge branch 'master' into v0.9
Conflicts:
ishtar_common/migrations/0053_auto__add_field_ishtarsiteprofile_currency.py
Diffstat (limited to 'ishtar_common/tests.py')
| -rw-r--r-- | ishtar_common/tests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 1b8601dfb..b779af221 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -17,7 +17,7 @@ # See the file COPYING for details. -from BeautifulSoup import BeautifulSoup as Soup +from bs4 import BeautifulSoup as Soup from django.conf import settings from django.contrib.auth.models import User |