diff options
| author | halna_Tanaguru <fhalna@oceaneconsulting.com> | 2017-04-04 12:06:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 12:06:53 +0200 |
| commit | 3abb0f7bc708ae8ca387aee8560b9558f8b209ba (patch) | |
| tree | 6014fdec3201d9e40fa244b821bdaffc83bfa131 /docs/Using-Mastodon/screenshots | |
| parent | 3f30ae1f97717177f29711d5b99d7970c6b75b3e (diff) | |
| parent | eb023beb4975a019d6a3b3091483c91c2c837bbd (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'docs/Using-Mastodon/screenshots')
16 files changed, 0 insertions, 0 deletions
diff --git a/docs/Using-Mastodon/screenshots/compose-cw.png b/docs/Using-Mastodon/screenshots/compose-cw.png new file mode 100644 index 000000000..584080a53 --- /dev/null +++ b/docs/Using-Mastodon/screenshots/compose-cw.png Binary files differdiff --git a/docs/Using-Mastodon/screenshots/compose-media.png b/docs/Using-Mastodon/screenshots/compose-media.png new file mode 100644 index 000000000..7a63c196c --- /dev/null +++ b/docs/Using-Mastodon/screenshots/compose-media.png Binary files differdiff --git a/docs/Using-Mastodon/screenshots/compose-nsfw.png b/docs/Using-Mastodon/screenshots/compose-nsfw.png new file mode 100644 index 000000000..a4ff5ed7b --- /dev/null +++ b/docs/Using-Mastodon/screenshots/compose-nsfw.png Binary files differdiff --git a/docs/Using-Mastodon/screenshots/compose-privacy.png b/docs/Using-Mastodon/screenshots/compose-privacy.png new file mode 100644 index 000000000..b18ed2043 --- /dev/null +++ b/docs/Using-Mastodon/screenshots/compose-privacy.png Binary files differdiff --git a/docs/Using-Mastodon/screenshots/content-warning.gif b/docs/Using-Mastodon/screenshots/content-warning.gif new file mode 100644 index 000000000..2e4720618 --- /dev/null +++ b/docs/Using-Mastodon/screenshots/content-warning.gif Binary files differdiff --git a/docs/Using-Mastodon/screenshots/cw-toot.gif b/docs/Using-Mastodon/screenshots/cw-toot.gif new file mode 100644 index 000000000..5329933a6 --- /dev/null +++ b/docs/Using-Mastodon/screenshots/cw-toot.gif Binary files differdiff --git a/docs/Using-Mastodon/screenshots/federated-timeline.png b/docs/Using-Mastodon/screenshots/federated-timeline.png new file mode 100644 index 000000000..d74b089fd --- /dev/null +++ b/docs/Using-Mastodon/screenshots/federated-timeline.png Binary files differdiff --git a/docs/Using-Mastodon/screenshots/follow-icon.png b/docs/Using-Mastodon/screenshots/follow-icon.png new file mode 100644 index 000000000..ee516c2f5 --- /dev/null +++ b/docs/Using-Mastodon/screenshots/follow-icon.png Binary files differdiff --git a/docs/Using-Mastodon/screenshots/following-icon.png b/docs/Using-Mastodon/screenshots/following-icon.png new file mode 100644 index 000000000..bccdc110e --- /dev/null +++ b/docs/Using-Mastodon/screenshots/following-icon.png Binary files differdiff --git a/docs/Using-Mastodon/screenshots/locked-icon.png b/docs/Using-Mastodon/screenshots/locked-icon.png new file mode 100644 index 000000000..d199f1f12 --- /dev/null +++ b/docs/Using-Mastodon/screenshots/locked-icon.png Binary files differdiff --git a/docs/Using-Mastodon/screenshots/notifications-clear.png b/docs/Using-Mastodon/screenshots/notifications-clear.png new file mode 100644 index 000000000..7d0922ccb --- /dev/null +++ b/docs/Using-Mastodon/screenshots/notifications-clear.png Binary files differdiff --git a/docs/Using-Mastodon/screenshots/notifications-settings.png b/docs/Using-Mastodon/screenshots/notifications-settings.png new file mode 100644 index 000000000..3a3417e7d --- /dev/null +++ b/docs/Using-Mastodon/screenshots/notifications-settings.png Binary files differdiff --git a/docs/Using-Mastodon/screenshots/pending-icon.png b/docs/Using-Mastodon/screenshots/pending-icon.png new file mode 100644 index 000000000..777b3c391 --- /dev/null +++ b/docs/Using-Mastodon/screenshots/pending-icon.png Binary files differdiff --git a/docs/Using-Mastodon/screenshots/preferences.png b/docs/Using-Mastodon/screenshots/preferences.png new file mode 100644 index 000000000..943413feb --- /dev/null +++ b/docs/Using-Mastodon/screenshots/preferences.png Binary files differdiff --git a/docs/Using-Mastodon/screenshots/private.png b/docs/Using-Mastodon/screenshots/private.png new file mode 100644 index 000000000..cf338aad0 --- /dev/null +++ b/docs/Using-Mastodon/screenshots/private.png Binary files differdiff --git a/docs/Using-Mastodon/screenshots/report.png b/docs/Using-Mastodon/screenshots/report.png new file mode 100644 index 000000000..5ce401ee7 --- /dev/null +++ b/docs/Using-Mastodon/screenshots/report.png Binary files differ |
