Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #29

Merged
merged 3 commits into from
Mar 23, 2024
Merged

Merge upstream #29

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
163b1a2
Silence "wal" output on setup using hide_output (#2368)
jvolkenant Mar 23, 2024
9b45046
Mail guide: OS X -> macOS (#2306)
gio3k Mar 23, 2024
4be2d1b
Merge remote-tracking branch 'upstream/main' into merge-upstream
downtownallday Mar 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion management/templates/mail-guide.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h3>Mobile/desktop apps</h3>

<h4>Automatic configuration</h4>

<p>iOS and OS X only: Open <a style="font-weight: bold" href="https://{{hostname}}/mailinabox.mobileconfig">this configuration link</a> on your iOS device or on your Mac desktop to easily set up mail (IMAP/SMTP), Contacts, and Calendar. Your username is your whole email address.</p>
<p>iOS and macOS only: Open <a style="font-weight: bold" href="https://{{hostname}}/mailinabox.mobileconfig">this configuration link</a> on your iOS device or on your Mac desktop to easily set up mail (IMAP/SMTP), Contacts, and Calendar. Your username is your whole email address.</p>

<h4>Manual configuration</h4>

Expand Down
Loading