diff options
author | kytwb <kytwb@pm.me> | 2022-01-08 13:22:33 +0100 |
---|---|---|
committer | kytwb <kytwb@pm.me> | 2022-01-08 13:22:33 +0100 |
commit | c70679b2c8572b7c0f5aa5df9c847884c29e1aed (patch) | |
tree | 23a681f887936d412ea35bc0a6e4f54a778956ab /README.md | |
parent | 5.6.9-nightly.2 [skip ci] (diff) | |
parent | Fix and run add-crowdin-contributors (diff) | |
download | ferdium-app-c70679b2c8572b7c0f5aa5df9c847884c29e1aed.tar.gz ferdium-app-c70679b2c8572b7c0f5aa5df9c847884c29e1aed.tar.zst ferdium-app-c70679b2c8572b7c0f5aa5df9c847884c29e1aed.zip |
Merge branch 'develop' into nightly
# Conflicts:
# src/internal-server/app/Controllers/Http/RecipeController.js
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -15,7 +15,7 @@ | |||
15 | <a href="https://github.com/getferdi/ferdi/actions/workflows/builds.yml"><img alt="Build Status" src="https://github.com/getferdi/ferdi/actions/workflows/builds.yml/badge.svg?branch=develop&event=push"></a> | 15 | <a href="https://github.com/getferdi/ferdi/actions/workflows/builds.yml"><img alt="Build Status" src="https://github.com/getferdi/ferdi/actions/workflows/builds.yml/badge.svg?branch=develop&event=push"></a> |
16 | <a title="Crowdin" target="_blank" href="https://crowdin.com/project/getferdi"><img src="https://badges.crowdin.net/getferdi/localized.svg"></a> | 16 | <a title="Crowdin" target="_blank" href="https://crowdin.com/project/getferdi"><img src="https://badges.crowdin.net/getferdi/localized.svg"></a> |
17 | <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section --> | 17 | <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section --> |
18 | <a href='#contributors-'><img src='https://img.shields.io/badge/contributors-119-default.svg?logo=github' alt='Contributors'/></a> | 18 | <a href='#contributors-'><img src='https://img.shields.io/badge/contributors-242-default.svg?logo=github' alt='Contributors'/></a> |
19 | <!-- ALL-CONTRIBUTORS-BADGE:END --> | 19 | <!-- ALL-CONTRIBUTORS-BADGE:END --> |
20 | <a href="#backers-via-opencollective"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective"></a> | 20 | <a href="#backers-via-opencollective"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective"></a> |
21 | <a href="https://gitter.im/getferdi/community"><img alt="Gitter Chat Room" src="https://img.shields.io/gitter/room/getferdi/community"></a> | 21 | <a href="https://gitter.im/getferdi/community"><img alt="Gitter Chat Room" src="https://img.shields.io/gitter/room/getferdi/community"></a> |