← Back to branch summary

~landscape/storm/staging

~landscape/storm/staging

Viewing all changes in revision 318.

Committer: Tarmac
Date: 2013-02-20 13:41:08 UTC
mfrom: (246.1.210 storm)
Revision ID: landscape-devel@lists.canonical.com-20130220134108-kanx0bt6xvkbs8qw

Tags: 13.02

Merging from trunk for staging deployment

files removed:
tests/django

tests/django/__init__.py

tests/django/backend.py

tests/django/middleware.py

tests/django/stores.py

files modified:
storm/database.py

tests/database.py

Show diffs side-by-side

added added

removed removed

storm/database.py

tests/database.py

tests/django/__init__.py

tests/django/backend.py

tests/django/middleware.py

tests/django/stores.py

Older »