mirror of
https://codeberg.org/fediverse/delightful-fediverse-clients.git
synced 2025-01-03 13:29:27 +01:00
Fix merge conflict
This commit is contained in:
commit
4215d94f74
@ -49,6 +49,7 @@ The applications in the table below are listed in alphabetic order. A :ghost: em
|
||||
| [**loris**](https://git.kittycat.homes/zoe/loris) | GoToSocial, Mastodon | Android, iOS, Linux, MacOS, Windows, Web-based | [`CNPLv7, Dart`](https://git.kittycat.homes/zoe/loris) <sup>1</sup> |
|
||||
| [**Macstodon**](https://github.com/smallsco/macstodon) | Mastodon | Classic MacOS | [`MIT, Python`](https://github.com/smallsco/macstodon) |
|
||||
| [**MastApple//c**](https://www.colino.net/wordpress/archives/2023/03/06/binary-release-of-mastodon-for-the-apple-c/) | Mastodon | Apple //c and e | [`GPL-3.0, C`](https://github.com/colinleroy/a2tools/) |
|
||||
| [**masto9**](https://git.sr.ht/~julienxx/masto9) | Mastodon, GoToSocial | 9front | [`MIT, C`](https://git.sr.ht/~julienxx/masto9) |
|
||||
| [**mastodon.el**](https://codeberg.org/martianh/mastodon.el) | Mastodon, Pleroma, GoToSocial | Emacs | [`GPL-3.0, Emacs Lisp`](https://codeberg.org/martianh/mastodon.el) |
|
||||
| [**Mastodon Android**](https://play.google.com/store/apps/details?id=org.joinmastodon.android) | Mastodon | Android | [`GPL-3.0, Java`](https://github.com/mastodon/mastodon-android) |
|
||||
| [**Mastodon 3.11 For Workgroups**](https://github.com/meyskens/mastodon-for-workgroups) | Mastodon | Windows 95 and higher | [`Apache-2.0, Visual Basic`](https://github.com/meyskens/mastodon-for-workgroups) |
|
||||
|
Loading…
Reference in New Issue
Block a user