Skip to content
Snippets Groups Projects
  1. Oct 29, 2019
  2. Oct 28, 2019
  3. Oct 26, 2019
  4. Oct 25, 2019
  5. Oct 24, 2019
  6. Oct 23, 2019
  7. Oct 21, 2019
  8. Oct 20, 2019
    • Ivan Tashkinov's avatar
      [#1304]. Post-merge fixes. Merge branch 'develop' of... · ee04fbc3
      Ivan Tashkinov authored
      [#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
      ee04fbc3
Loading