diff options
| author | Francis Dinh <normandy@firemail.cc> | 2018-05-20 19:17:15 -0400 |
|---|---|---|
| committer | Francis Dinh <normandy@firemail.cc> | 2018-05-20 19:17:15 -0400 |
| commit | 1afd6d37bd2febb58ee09d273b9c7d690022d3c3 (patch) | |
| tree | 8be53801457cae7e31f7efdb501b81974ca3b36f /README.md | |
| parent | d46393f6efd6475bb20b6a12a7c6ebf800f6c5b5 (diff) | |
| parent | 961f1312571843209487cc1caa9355fa6552d965 (diff) | |
| download | pleroma-1afd6d37bd2febb58ee09d273b9c7d690022d3c3.tar.gz pleroma-1afd6d37bd2febb58ee09d273b9c7d690022d3c3.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow
Fixed some conflicts in transmogrifier.ex
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -74,7 +74,7 @@ This is useful for running pleroma inside Tor or i2p. ### Register a User -Run `mix register_user <name> <nickname> <email> <bio>`. The `name` appears on statuses, while the nickname corresponds to the user, e.g. `@nickname@instance.tld` +Run `mix register_user <name> <nickname> <email> <bio> <password>`. The `name` appears on statuses, while the nickname corresponds to the user, e.g. `@nickname@instance.tld` ### Password reset |