diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-01-21 12:03:29 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-01-21 12:03:29 +0000 |
commit | ab3f03a04a34f2e267bef649ea7d055df583e43e (patch) | |
tree | 41c555d32f0805a45f553ae348b9bf42158e9426 /docs/assets | |
parent | a5f64ffd0cba5e183744cf46506656ba61d36eda (diff) | |
parent | 548434f85ccaa4a77c460fb5bda37153ea6e9c39 (diff) | |
download | pleroma-ab3f03a04a34f2e267bef649ea7d055df583e43e.tar.gz pleroma-ab3f03a04a34f2e267bef649ea7d055df583e43e.zip |
Merge branch 'develop' into 'public-polls'
# Conflicts:
# docs/development/API/differences_in_mastoapi_responses.md
Diffstat (limited to 'docs/assets')
-rw-r--r-- | docs/assets/admin_dash_location.png | bin | 0 -> 8698 bytes |
-rw-r--r-- | docs/assets/frontends_tab.png | bin | 0 -> 148269 bytes |
-rw-r--r-- | docs/assets/old_adminfe_link.png | bin | 0 -> 15143 bytes |
-rw-r--r-- | docs/assets/primary_frontend_section.png | bin | 0 -> 26498 bytes |
-rw-r--r-- | docs/assets/way_to_install_frontends.png | bin | 0 -> 130193 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/docs/assets/admin_dash_location.png b/docs/assets/admin_dash_location.png Binary files differnew file mode 100644 index 000000000..4e1d110e7 --- /dev/null +++ b/docs/assets/admin_dash_location.png diff --git a/docs/assets/frontends_tab.png b/docs/assets/frontends_tab.png Binary files differnew file mode 100644 index 000000000..f7c66adab --- /dev/null +++ b/docs/assets/frontends_tab.png diff --git a/docs/assets/old_adminfe_link.png b/docs/assets/old_adminfe_link.png Binary files differnew file mode 100644 index 000000000..5ea6a486c --- /dev/null +++ b/docs/assets/old_adminfe_link.png diff --git a/docs/assets/primary_frontend_section.png b/docs/assets/primary_frontend_section.png Binary files differnew file mode 100644 index 000000000..14c3de41b --- /dev/null +++ b/docs/assets/primary_frontend_section.png diff --git a/docs/assets/way_to_install_frontends.png b/docs/assets/way_to_install_frontends.png Binary files differnew file mode 100644 index 000000000..a90ff2b5d --- /dev/null +++ b/docs/assets/way_to_install_frontends.png |