aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorLibravatar vantezzen <hello@vantezzen.io>2019-10-30 10:16:56 +0100
committerLibravatar vantezzen <hello@vantezzen.io>2019-10-30 10:16:56 +0100
commit25587405b2296ad3a44a26a5eb0775e3ff14ec06 (patch)
treea1798f068e1945fa97879e6a76c0a48a757f1ca2 /README.md
parent#173 Update feature list (diff)
parentMerge pull request #175 from getferdi/l10n_develop (diff)
downloadferdium-app-25587405b2296ad3a44a26a5eb0775e3ff14ec06.tar.gz
ferdium-app-25587405b2296ad3a44a26a5eb0775e3ff14ec06.tar.zst
ferdium-app-25587405b2296ad3a44a26a5eb0775e3ff14ec06.zip
Merge branch 'develop' of https://github.com/getferdi/ferdi into develop
Diffstat (limited to 'README.md')
-rw-r--r--README.md6
1 files changed, 2 insertions, 4 deletions
diff --git a/README.md b/README.md
index b7f43c337..ec0f8a338 100644
--- a/README.md
+++ b/README.md
@@ -197,8 +197,7 @@ When pushing a new tag, the CI builds will create a draft GitHub release and upl
197Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)): 197Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
198 198
199<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section --> 199<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
200<!-- prettier-ignore-start --> 200<!-- prettier-ignore -->
201<!-- markdownlint-disable -->
202<table> 201<table>
203 <tr> 202 <tr>
204 <td align="center"><a href="https://vantezzen.io"><img src="https://avatars2.githubusercontent.com/u/10333196?v=4" width="40px;" alt="Bennett"/><br /><sub><b>Bennett</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Code">💻</a> <a href="#design-vantezzen" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Documentation">📖</a> <a href="#ideas-vantezzen" title="Ideas, Planning, & Feedback">🤔</a> <a href="#translation-vantezzen" title="Translation">🌍</a> <a href="#example-vantezzen" title="Examples">💡</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Avantezzen" title="Bug reports">🐛</a> <a href="#content-vantezzen" title="Content">🖋</a> <a href="#infra-vantezzen" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#userTesting-vantezzen" title="User Testing">📓</a> <a href="#question-vantezzen" title="Answering Questions">💬</a> <a href="#projectManagement-vantezzen" title="Project Management">📆</a> <a href="#review-vantezzen" title="Reviewed Pull Requests">👀</a></td> 203 <td align="center"><a href="https://vantezzen.io"><img src="https://avatars2.githubusercontent.com/u/10333196?v=4" width="40px;" alt="Bennett"/><br /><sub><b>Bennett</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Code">💻</a> <a href="#design-vantezzen" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Documentation">📖</a> <a href="#ideas-vantezzen" title="Ideas, Planning, & Feedback">🤔</a> <a href="#translation-vantezzen" title="Translation">🌍</a> <a href="#example-vantezzen" title="Examples">💡</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Avantezzen" title="Bug reports">🐛</a> <a href="#content-vantezzen" title="Content">🖋</a> <a href="#infra-vantezzen" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#userTesting-vantezzen" title="User Testing">📓</a> <a href="#question-vantezzen" title="Answering Questions">💬</a> <a href="#projectManagement-vantezzen" title="Project Management">📆</a> <a href="#review-vantezzen" title="Reviewed Pull Requests">👀</a></td>
@@ -227,11 +226,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
227 <tr> 226 <tr>
228 <td align="center"><a href="https://github.com/Stanzilla"><img src="https://avatars3.githubusercontent.com/u/75278?v=4" width="40px;" alt="Benjamin Staneck"/><br /><sub><b>Benjamin Staneck</b></sub></a><br /><a href="#design-Stanzilla" title="Design">🎨</a></td> 227 <td align="center"><a href="https://github.com/Stanzilla"><img src="https://avatars3.githubusercontent.com/u/75278?v=4" width="40px;" alt="Benjamin Staneck"/><br /><sub><b>Benjamin Staneck</b></sub></a><br /><a href="#design-Stanzilla" title="Design">🎨</a></td>
229 <td align="center"><a href="https://github.com/ammarmalhas"><img src="https://avatars1.githubusercontent.com/u/57057209?v=4" width="40px;" alt="ammarmalhas"/><br /><sub><b>ammarmalhas</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aammarmalhas" title="Bug reports">🐛</a> <a href="#security-ammarmalhas" title="Security">🛡️</a></td> 228 <td align="center"><a href="https://github.com/ammarmalhas"><img src="https://avatars1.githubusercontent.com/u/57057209?v=4" width="40px;" alt="ammarmalhas"/><br /><sub><b>ammarmalhas</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aammarmalhas" title="Bug reports">🐛</a> <a href="#security-ammarmalhas" title="Security">🛡️</a></td>
229 <td align="center"><a href="https://github.com/steliyan"><img src="https://avatars1.githubusercontent.com/u/1850292?v=4" width="40px;" alt="Steliyan Stoyanov"/><br /><sub><b>Steliyan Stoyanov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=steliyan" title="Code">💻</a> <a href="#ideas-steliyan" title="Ideas, Planning, & Feedback">🤔</a></td>
230 </tr> 230 </tr>
231</table> 231</table>
232 232
233<!-- markdownlint-enable -->
234<!-- prettier-ignore-end -->
235<!-- ALL-CONTRIBUTORS-LIST:END --> 233<!-- ALL-CONTRIBUTORS-LIST:END -->
236 234
237<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section --> 235<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->