mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-24 10:28:06 +01:00
fc500a6062
Conflicts: - `CONTRIBUTING.md`: Upstream file has changed and we're quoting it. Ported the changes. - `README.md`: Upstream file has changed but we have a completely different one. Kept our version. - `lib/mastodon/version.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version. - `spec/presenters/instance_presenter_spec.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version.
14 lines
805 B
Markdown
14 lines
805 B
Markdown
# Mastodon Glitch Edition #
|
|
|
|
> Now with automated deploys!
|
|
|
|
[][circleci]
|
|
[][code_climate]
|
|
|
|
[circleci]: https://circleci.com/gh/glitch-soc/mastodon
|
|
[code_climate]: https://codeclimate.com/github/glitch-soc/mastodon
|
|
|
|
So here's the deal: we all work on this code, and then it runs on dev.glitch.social and anyone who uses that does so absolutely at their own risk. can you dig it?
|
|
|
|
- You can view documentation for this project at [glitch-soc.github.io/docs/](https://glitch-soc.github.io/docs/).
|
|
- And contributing guidelines are available [here](CONTRIBUTING.md) and [here](https://glitch-soc.github.io/docs/contributing/).
|