akkoma/lib
Ivan Tashkinov 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
2019-10-06 11:43:49 +03:00
..
mix Move config task docs to a separate file and mark it as WIP 2019-10-03 14:12:57 +03:00
pleroma Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 2019-10-06 11:43:49 +03:00
jason_types.ex Add license/copyright to all project files 2019-07-10 05:13:23 +00:00
transports.ex Add license/copyright to all project files 2019-07-10 05:13:23 +00:00
xml_builder.ex Add license/copyright to all project files 2019-07-10 05:13:23 +00:00