diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-06-02 14:33:26 +0200 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-06-02 14:41:50 +0200 |
| commit | 7fd6f623f1cb558360c940a6dd1dc6c1e74fe31b (patch) | |
| tree | 89c29354c416cbcbf2eb0827e61c7084a80fdf22 /setup.py | |
| parent | c849e690925cb656b8c00ccbeda12aeab22c2fdd (diff) | |
| parent | 4d4b49a84e2791da6b12ef580565251c379264b6 (diff) | |
| download | mediagoblin-7fd6f623f1cb558360c940a6dd1dc6c1e74fe31b.tar.lz mediagoblin-7fd6f623f1cb558360c940a6dd1dc6c1e74fe31b.tar.xz mediagoblin-7fd6f623f1cb558360c940a6dd1dc6c1e74fe31b.zip | |
Merge remote branch 'upstream/master'
Conflicts:
mediagoblin/templates/mediagoblin/user_pages/media.html
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -18,7 +18,7 @@ from setuptools import setup, find_packages setup( name = "mediagoblin", - version = "0.0.1", + version = "0.0.2", packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), zip_safe=False, # scripts and dependencies @@ -45,7 +45,7 @@ setup( test_suite='nose.collector', license = 'AGPLv3', - author = 'Christopher Webber', + author = 'Free Software Foundation and contributors', author_email = 'cwebber@gnu.org', entry_points = """\ [console_scripts] |