diff options
| author | kaniini <nenolod@gmail.com> | 2018-11-06 16:18:12 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-11-06 16:18:12 +0000 |
| commit | a68c18f0ad6befe432e961bd348744b305492524 (patch) | |
| tree | 4096642128f76339d86a4beee7a5b19609f05876 /installation/pleroma.nginx | |
| parent | 0f3e78addb4a88106120737f2eb603ec136d99f9 (diff) | |
| parent | 236fd28aca4191617cf059ff0a536f6b2fef5d64 (diff) | |
| download | pleroma-a68c18f0ad6befe432e961bd348744b305492524.tar.gz pleroma-a68c18f0ad6befe432e961bd348744b305492524.zip | |
Merge branch 'unify-mastodon-oauth' into 'develop'
Unify Mastodon Login with OAuth login.
See merge request pleroma/pleroma!429
Diffstat (limited to 'installation/pleroma.nginx')
0 files changed, 0 insertions, 0 deletions