diff options
| author | Joar Wandborg <git@wandborg.com> | 2011-06-15 22:18:24 +0200 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2011-06-15 22:18:24 +0200 |
| commit | 9e883ed3b223311e3325e41e75dec7ee82875ac2 (patch) | |
| tree | de5c404187681bf35d7a92e917c54a69e902df91 /mediagoblin/tests/test_globals.py | |
| parent | a48014d67a5185c645ac876d365b4cb85cbb6b1f (diff) | |
| parent | 0e9dd2a28669a4d42c4a3828dbd047937acd776c (diff) | |
| download | mediagoblin-9e883ed3b223311e3325e41e75dec7ee82875ac2.tar.lz mediagoblin-9e883ed3b223311e3325e41e75dec7ee82875ac2.tar.xz mediagoblin-9e883ed3b223311e3325e41e75dec7ee82875ac2.zip | |
Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/tests/test_globals.py')
| -rw-r--r-- | mediagoblin/tests/test_globals.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/tests/test_globals.py b/mediagoblin/tests/test_globals.py index 6d2e01da..59d217f3 100644 --- a/mediagoblin/tests/test_globals.py +++ b/mediagoblin/tests/test_globals.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from mediagoblin import globals as mg_globals +from mediagoblin import mg_globals def test_setup_globals(): mg_globals.setup_globals( |