qb_akkoma/lib
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
..
mix Merge branch 'refactor/user' into 'develop' 2019-09-26 03:00:38 +00:00
pleroma [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 2019-10-02 20:42:40 +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