diff options
| author | Andrew Godwin <andrew@aeracode.org> | 2013-04-18 17:16:39 +0100 |
|---|---|---|
| committer | Andrew Godwin <andrew@aeracode.org> | 2013-04-18 17:16:39 +0100 |
| commit | 7f3678dc4cd7146c49bac3fb8f5211f647636aa3 (patch) | |
| tree | fdd2a60ccd1a9a3162d89f970db44502e35a3b3f /tests/admin_scripts/simple_app | |
| parent | b62e82365ad56ca930f7abb1d1dbdf9ce5a7c7c3 (diff) | |
| parent | 93c1576f17f6c5ee73f94f8de007f3c33010dc81 (diff) | |
Merge branch 'master' into schema-alteration
Conflicts:
django/db/backends/__init__.py
django/db/backends/mysql/base.py
django/db/backends/oracle/base.py
django/db/backends/oracle/creation.py
django/db/backends/postgresql_psycopg2/base.py
django/db/backends/sqlite3/base.py
django/db/models/fields/related.py
Diffstat (limited to 'tests/admin_scripts/simple_app')
| -rw-r--r-- | tests/admin_scripts/simple_app/__init__.py | 0 | ||||
| -rw-r--r-- | tests/admin_scripts/simple_app/models.py | 3 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tests/admin_scripts/simple_app/__init__.py b/tests/admin_scripts/simple_app/__init__.py new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/admin_scripts/simple_app/__init__.py diff --git a/tests/admin_scripts/simple_app/models.py b/tests/admin_scripts/simple_app/models.py new file mode 100644 index 0000000000..b89f4b898b --- /dev/null +++ b/tests/admin_scripts/simple_app/models.py @@ -0,0 +1,3 @@ +from __future__ import absolute_import + +from ..complex_app.models.bar import Bar |