diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-26 18:21:33 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-26 18:21:33 +0200 |
| commit | be20eb4b2f4e55c472263a98a2c07b4e805d9bd5 (patch) | |
| tree | 71e25690e6300d0235d515ccd0241d082c8d1abe /lib/cli.rb | |
| parent | 5eb3b8522e6f4ba7e5cc1f5ffa5dc51f9ac09290 (diff) | |
| parent | a791bac153cf979adeaf3024d65917dbd699b5d9 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'lib/cli.rb')
| -rw-r--r-- | lib/cli.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/cli.rb b/lib/cli.rb index 7e82806b6..c7dae0276 100644 --- a/lib/cli.rb +++ b/lib/cli.rb @@ -2,10 +2,14 @@ require 'thor' require_relative 'mastodon/media_cli' +require_relative 'mastodon/emoji_cli' module Mastodon class CLI < Thor desc 'media SUBCOMMAND ...ARGS', 'manage media files' subcommand 'media', Mastodon::MediaCLI + + desc 'emoji SUBCOMMAND ...ARGS', 'manage custom emoji' + subcommand 'emoji', Mastodon::EmojiCLI end end |