1. 03 Nov, 2020 1 commit
  2. 30 Oct, 2020 3 commits
  3. 13 Oct, 2020 1 commit
  4. 01 Sep, 2020 1 commit
  5. 30 May, 2020 1 commit
  6. 12 May, 2020 1 commit
  7. 05 May, 2020 1 commit
  8. 02 Mar, 2020 1 commit
  9. 19 Dec, 2019 1 commit
  10. 07 Nov, 2019 1 commit
  11. 20 Oct, 2019 1 commit
    • 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
  12. 17 Oct, 2019 1 commit
  13. 16 Oct, 2019 1 commit
  14. 05 Oct, 2019 2 commits
  15. 03 Oct, 2019 1 commit
  16. 30 Sep, 2019 1 commit