diff options
| author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-15 23:25:47 +0200 |
|---|---|---|
| committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-15 23:25:47 +0200 |
| commit | bb770e295cd727429df524b0a5c3952ea449fdb2 (patch) | |
| tree | e8a894c2a75e7ff53946b05508f82b501c37189e /mediagoblin/tests/test_globals.py | |
| parent | bb10e5bef7ae062424b4c334a73c4ce988e37ccf (diff) | |
| parent | 0e9dd2a28669a4d42c4a3828dbd047937acd776c (diff) | |
| download | mediagoblin-bb770e295cd727429df524b0a5c3952ea449fdb2.tar.lz mediagoblin-bb770e295cd727429df524b0a5c3952ea449fdb2.tar.xz mediagoblin-bb770e295cd727429df524b0a5c3952ea449fdb2.zip | |
Merge remote-tracking branch 'gitorious/master'
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( |