tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2022-08-15 14:33:05 +02:00
parent 3f15326a05 113dd90aa3
commit e2a7a458d6
159 changed files with 1537 additions and 1316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mastodon/accounts_cli.rb
View File

@@ -57,7 +57,7 @@ module Mastodon
option :role
option :reattach, type: :boolean
option :force, type: :boolean
desc 'create USERNAME', 'Create a new user'
desc 'create USERNAME', 'Create a new user account'
long_desc <<-LONG_DESC
Create a new user account with a given USERNAME and an
e-mail address provided with --email.
@@ -133,7 +133,7 @@ module Mastodon
option :disable_2fa, type: :boolean
option :approve, type: :boolean
option :reset_password, type: :boolean
desc 'modify USERNAME', 'Modify a user'
desc 'modify USERNAME', 'Modify a user account'
long_desc <<-LONG_DESC
Modify a user account.