pleroma

Fork of Pleroma with site-specific changes and feature branches https://git.pleroma.social/pleroma/pleroma

Vēsture

Ivan Tashkinov ee04fbc35a [#1304 ]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs		pirms 4 gadiem
..
API	[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation	pirms 4 gadiem
administration	Add a missing language specification	pirms 4 gadiem
configuration	Add documentation for PWA manifest configuration.	pirms 4 gadiem
installation	Preparations for renaming `master` to `stable`	pirms 4 gadiem
clients.md	docs/clients.md: Update source code urls	pirms 4 gadiem
introduction.md	trailing spaces	pirms 5 gadiem