Merge branch 'develop' into feature/oidc-v2

This commit is contained in:
Michael Mayer 2021-10-21 13:36:53 +02:00
commit 39063d892d
2 changed files with 8 additions and 7 deletions

View file

@ -70,7 +70,7 @@ if you have verified that no similar [idea](https://github.com/photoprism/photop
## Questions? ## Questions?
Follow us on [Twitter](https://twitter.com/photoprism_app) or join our [Community Chat](https://gitter.im/browseyourlife/community) Follow us on [Twitter](https://twitter.com/photoprism_app) or join our [Community Chat](https://gitter.im/browseyourlife/community)
to get regular updates, connect with other contributors, and discuss your ideas. Don't be afraid to ask silly questions. to get regular updates, connect with other users, and discuss your ideas. Don't be afraid to ask silly questions.
## Getting Support ## ## Getting Support ##

View file

@ -1,4 +1,7 @@
## THIS OPEN-SOURCE PROJECT IS MADE POSSIBLE THANKS TO OUR SPONSORS ## ## Gold and Platinum Sponsors ##
Your continued [support](https://docs.photoprism.org/funding/) helps us provide
services like satellite maps and develop new features. Thank you very much! 💜
[Sid Karunaratne](https://github.com/sakaru) (Patreon, May 2019) [Sid Karunaratne](https://github.com/sakaru) (Patreon, May 2019)
@ -36,9 +39,7 @@ Garn Penrod (Patreon, November 2020)
[Daniel Hähnke](https://github.com/DanBenHa) (GitHub Sponsors, July 2021) [Daniel Hähnke](https://github.com/DanBenHa) (GitHub Sponsors, July 2021)
Thank you very much! 💜 *See https://github.com/sponsors/photoprism for a full list of GitHub sponsors.*
See https://github.com/sponsors/photoprism for a full list of GitHub sponsors.
## One-Time Donations ## ## One-Time Donations ##
@ -47,9 +48,9 @@ Klemens Guder, [Greg](https://github.com/oziee), Jean-Louis Frenkel,
[INIT_6](https://twitter.com/init_3), Sandro Rüegge, William Kray, Ovace Mamnoon, Clément Caplain Moreau, [INIT_6](https://twitter.com/init_3), Sandro Rüegge, William Kray, Ovace Mamnoon, Clément Caplain Moreau,
The Gordon Project The Gordon Project
## Crypto ## ## Crypto Wallets ##
| Currency | Dontation Address | | Currency | Address |
|:-----------|:-----------------------------------------------------------------------------------------------------| |:-----------|:-----------------------------------------------------------------------------------------------------|
| Monero | [`474qhuQzC59g4i7cn8mN9VeRGRJHvChmUhL5Fh53hntah63QzB7ERxEb5woVvJkc1KZuGZ3GsGh7d5w9d6SUBHmrUzGeEWT`](monero:474qhuQzC59g4i7cn8mN9VeRGRJHvChmUhL5Fh53hntah63QzB7ERxEb5woVvJkc1KZuGZ3GsGh7d5w9d6SUBHmrUzGeEWT) | | Monero | [`474qhuQzC59g4i7cn8mN9VeRGRJHvChmUhL5Fh53hntah63QzB7ERxEb5woVvJkc1KZuGZ3GsGh7d5w9d6SUBHmrUzGeEWT`](monero:474qhuQzC59g4i7cn8mN9VeRGRJHvChmUhL5Fh53hntah63QzB7ERxEb5woVvJkc1KZuGZ3GsGh7d5w9d6SUBHmrUzGeEWT) |
| Dogecoin | [`DRCBHso4xaE2DRGpWuaif7jma1UwTKcAGq`](dogecoin:DRCBHso4xaE2DRGpWuaif7jma1UwTKcAGq) | | Dogecoin | [`DRCBHso4xaE2DRGpWuaif7jma1UwTKcAGq`](dogecoin:DRCBHso4xaE2DRGpWuaif7jma1UwTKcAGq) |