mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-27 05:53:08 +02:00
Merge branch 'develop' of https://github.com/transfem-org/Sharkey into develop
This commit is contained in:
commit
caafcaccc9
2 changed files with 4 additions and 4 deletions
|
@ -1,9 +1,9 @@
|
||||||
<div align="center">
|
<div align="center">
|
||||||
<a href="https://dev.joinsharkey.org/">
|
<a href="https://joinsharkey.org/">
|
||||||
<img src="https://cdn.transfem.social/files/06eb1052-fd80-448a-803e-3adf7a2d03a3.png" alt="Sharkey logo" style="border-radius:50%" width="400"/>
|
<img src="https://cdn.transfem.social/files/06eb1052-fd80-448a-803e-3adf7a2d03a3.png" alt="Sharkey logo" style="border-radius:50%" width="400"/>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
**🌎 **[Sharkey](https://dev.joinsharkey.org/)** is an open source, decentralized social media platform that's free forever! 🚀**
|
**🌎 **[Sharkey](https://joinsharkey.org/)** is an open source, decentralized social media platform that's free forever! 🚀**
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
|
|
||||||
<a href="https://dev.joinsharkey.org/"><img src="https://cdn.transfem.social/files/dce7b668-fa9e-44e9-8e53-60fd743681aa.png" align="right" height="320px"/></a>
|
<a href="https://joinsharkey.org/"><img src="https://cdn.transfem.social/files/dce7b668-fa9e-44e9-8e53-60fd743681aa.png" align="right" height="320px"/></a>
|
||||||
|
|
||||||
## ✨ Features
|
## ✨ Features
|
||||||
- **ActivityPub support**\
|
- **ActivityPub support**\
|
||||||
|
|
|
@ -22,7 +22,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<button v-if="thereIsTreasure" class="_button treasure" @click="getTreasure"><img src="/fluent-emoji/1f3c6.png" class="treasureImg"></button>
|
<button v-if="thereIsTreasure" class="_button treasure" @click="getTreasure"><img src="/fluent-emoji/1f3c6.png" class="treasureImg"></button>
|
||||||
</div>
|
</div>
|
||||||
<div style="text-align: center;">
|
<div style="text-align: center;">
|
||||||
{{ i18n.ts._aboutMisskey.about }}<br><a href="https://misskey-hub.net/docs/misskey.html" target="_blank" class="_link">{{ i18n.ts.learnMore }}</a>
|
{{ i18n.ts._aboutMisskey.about }}<br><a href="https://joinsharkey.org/" target="_blank" class="_link">{{ i18n.ts.learnMore }}</a>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="$i != null" style="text-align: center;">
|
<div v-if="$i != null" style="text-align: center;">
|
||||||
<MkButton primary rounded inline @click="iLoveMisskey">I <Mfm text="$[jelly ❤]"/> #Sharkey</MkButton>
|
<MkButton primary rounded inline @click="iLoveMisskey">I <Mfm text="$[jelly ❤]"/> #Sharkey</MkButton>
|
||||||
|
|
Loading…
Reference in a new issue