Ivan Tashkinov baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs		2019-04-01 08:49:32 +03:00
..
activity_pub	Fix missing announces in MastoAPI home timeline	2019-03-27 12:28:53 +03:00
admin_api	Add user show endpoint for Pleroma admin API	2019-03-27 21:44:15 +03:00
auth	[#923] OAuth consumer improvements, fixes, refactoring.	2019-03-27 15:39:35 +03:00
channels	[Credo] write large numbers with underscore separation	2019-03-13 04:26:56 +01:00
common_api	…
federator	Replace Pleroma.Jobs with `pleroma_job_queue`	2019-03-29 12:46:05 +00:00
http_signatures	…
mastodon_api	Add vapid_key to the `POST /api/v1/apps` response	2019-03-26 23:27:37 +03:00
media_proxy	…
metadata	…
nodeinfo	…
oauth	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	2019-04-01 08:49:32 +03:00
ostatus	ostatus: use preload objects with Object.normalize() when opportunistic	2019-03-23 03:05:57 +00:00
push	…
rich_media	…
salmon	…
templates	[#923] OAuth consumer improvements, fixes, refactoring.	2019-03-27 15:39:35 +03:00
twitter_api	Remove ActivityRepresenter	2019-03-26 17:16:21 +03:00
views	…
web_finger	…
websub	…
xml	…
chat_channel.ex	…
controller_helper.ex	…
endpoint.ex	…
gettext.ex	…
metadata.ex	…
oauth.ex	…
rel_me.ex	…
router.ex	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	2019-04-01 08:49:32 +03:00
streamer.ex	streamer: use the preloaded object if possible	2019-03-23 02:29:01 +00:00
uploader_controller.ex	…
web.ex	…