Merge remote-tracking branch 'spechards-mediagoblin/master'

Conflicts:
	mediagoblin/submit/lib.py -- happened because of creator->actor
                                     change

Fixes issue #915
This commit is contained in:
Boris Bobrov
2017-01-29 19:09:06 +03:00
3 changed files with 18 additions and 2 deletions

View File

@@ -37,6 +37,7 @@ Here's a longer example that makes use of more options::
./bin/gmg addmedia aveyah awesome_spaceship.png \
--title "My awesome spaceship" \
--description "Flying my awesome spaceship, since I'm an awesome pilot" \
--collection-slug i-m-an-awesome-pilot \
--license "http://creativecommons.org/licenses/by-sa/3.0/" \
--tags "spaceships, pilots, awesome" \
--slug "awesome-spaceship"