4 commits

Author	SHA1	Message	Date
Mark Felder	05da5f5cca	Update Copyrights	2020-03-03 16:44:49 -06:00
Ivan Tashkinov	64095961fe	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex	2019-10-02 20:42:40 +03:00
Ariadne Conill	1d7cbdaf7b	change new scrobble endpoint	2019-09-30 10:39:48 +00:00
Ariadne Conill	e653edd182	split scrobble functions into their own controller	2019-09-30 10:39:48 +00:00