From: feld <feld@feld.me>
Date: Mon, 7 Jun 2021 21:21:35 +0000 (+0000)
Subject: Merge branch 'pleromapi' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=30943b739d8d7eefed94f13bc442d1fc348e2737;hp=-c;p=akkoma

Merge branch 'pleromapi' into 'develop'

Add Raspberry Pi install instructions

See merge request pleroma/pleroma!3430
---

30943b739d8d7eefed94f13bc442d1fc348e2737
diff --combined README.md
index 6aa36d89a,0099fe990..ba1522089
--- a/README.md
+++ b/README.md
@@@ -35,6 -35,9 +35,9 @@@ Currently Pleroma is not packaged by an
  ### Docker
  While we don’t provide docker files, other people have written very good ones. Take a look at <https://github.com/angristan/docker-pleroma> or <https://glitch.sh/sn0w/pleroma-docker>.
  
+ ### Raspberry Pi
+ Community maintained Raspberry Pi image that you can flash and run Pleroma on your Raspberry Pi. Available here <https://github.com/guysoft/PleromaPi>.
+ 
  ### Compilation Troubleshooting
  If you ever encounter compilation issues during the updating of Pleroma, you can try these commands and see if they fix things:
  
@@@ -50,5 -53,5 +53,5 @@@ If you are not developing Pleroma, it i
  - Latest Git revision: <https://docs-develop.pleroma.social>
  
  ## Community Channels
 -* IRC: **#pleroma** and **#pleroma-dev** on freenode, webchat is available at <https://irc.pleroma.social>
 -* Matrix: <https://matrix.to/#/#freenode_#pleroma:matrix.org> and <https://matrix.to/#/#freenode_#pleroma-dev:matrix.org>
 +* IRC: **#pleroma** and **#pleroma-dev** on libera.chat, webchat is available at <https://irc.pleroma.social>
 +* Matrix: [#pleroma:libera.chat](https://matrix.to/#/#pleroma:libera.chat) and [#pleroma-dev:libera.chat](https://matrix.to/#/#pleroma-dev:libera.chat)