Commit d64d58ca authored by zauberstuhl's avatar zauberstuhl
Browse files

Merge branch 'jaywink-master-patch-24944' into 'master'

Replace readme info with wiki link

See merge request feneas/association!16
parents 4e61f5e5 f563cf9f
......@@ -12,18 +12,9 @@ Currently the page includes:
* Code of Conduct
* Privacy Policy
## Members
## Wiki
TBD
## Assets
* Website/blog - https://feneas.org
* GitLab code hosting - https://git.feneas.org
* Chatroom - Matrix at `#feneas:feneas.org` ([web link](https://riot.im/app/#/room/#feneas:feneas.org))
* You can register an account at the Feneas homeserver with any Matrix client using a the homeserver `https://feneas.org`
* Holvi bank account
* Online shop
Please see our [wiki](https://git.feneas.org/feneas/association/wikis/home) for information on how to join, assets owned by the assocation, meeting logs, etc.
## License
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment