diff options
author | Boris Bobrov <breton@cynicmansion.ru> | 2017-01-29 19:09:06 +0300 |
---|---|---|
committer | Boris Bobrov <breton@cynicmansion.ru> | 2017-01-29 19:09:06 +0300 |
commit | f86dafe2a01e64183e54d4a98eccb01d007c68e6 (patch) | |
tree | b0820ed282615c8b87297e198ce4b141c869a84a /mediagoblin/gmg_commands/deletemedia.py | |
parent | d26ea3f3bcb4543f6e3eefb507d278fc4d068b4e (diff) | |
parent | e119aed22900b682c7dd2cce979f694282f5dbe5 (diff) | |
download | mediagoblin-f86dafe2a01e64183e54d4a98eccb01d007c68e6.tar.lz mediagoblin-f86dafe2a01e64183e54d4a98eccb01d007c68e6.tar.xz mediagoblin-f86dafe2a01e64183e54d4a98eccb01d007c68e6.zip |
Merge remote-tracking branch 'spechards-mediagoblin/master'
Conflicts:
mediagoblin/submit/lib.py -- happened because of creator->actor
change
Fixes issue #915
Diffstat (limited to 'mediagoblin/gmg_commands/deletemedia.py')
0 files changed, 0 insertions, 0 deletions