diff options
| author | nemsia <nemsia@nemsia.org> | 2017-05-08 11:23:39 +0200 |
|---|---|---|
| committer | nemsia <nemsia@nemsia.org> | 2017-05-08 11:23:39 +0200 |
| commit | 66241c742ace8de56a454a5860cecb0353bbfd6e (patch) | |
| tree | b383015cc4658dc7fc7ba1337e8ddac2109dd773 /README.md | |
| parent | e55bcb48f10b33fed34db406fa09d24259714d1b (diff) | |
| parent | 70d41205f334c3ce1e8fa4a9715caa2d5ed6c0cb (diff) | |
| download | mastodon_ynh-66241c742ace8de56a454a5860cecb0353bbfd6e.tar.gz mastodon_ynh-66241c742ace8de56a454a5860cecb0353bbfd6e.tar.bz2 mastodon_ynh-66241c742ace8de56a454a5860cecb0353bbfd6e.zip | |
Resolved merge conflict
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -89,5 +89,6 @@ It seems important to close the inscriptions for your Mastodon, so that it remai - [x] [Create automatic user](https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Administration-guide.md#creating-users-while-registration-is-closed) - [x] Fix restore - [x] Install from a release -- [ ] Tune [Create automatic user](https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Administration-guide.md#creating-users-while-registration-is-closed) +- [x] Tune [Create automatic user](https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Administration-guide.md#creating-users-while-registration-is-closed) +- [ ] Change SMTP settings - [ ] Fix errors on jenkins |