Merge branch 'master' of git.sv.gnu.org:/srv/git/mediagoblin

2017-11-11 16:05:43 +03:00 · 2017-11-11 16:05:43 +03:00 · a63d628f59
commit a63d628f59
parent 6c981dd541 807f96d5c4
2 changed files with 1 additions and 1 deletions
--- a/mediagoblin/templates/mediagoblin/federation/host-meta.xml
+++ b/mediagoblin/templates/mediagoblin/federation/host-meta.xml
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@ -101,7 +101,7 @@ def test_register_views(test_app):
            'password': 'iamsohappy',
            'email': 'easter@egg.com'})

-    ## At this point there should on user in the database
+    ## At this point there should be one user in the database
    assert User.query.count() == 1

    # Successful register