Ivan Tashkinov 37925cbe78 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ...

# Conflicts:
#	lib/pleroma/web/oauth/oauth_controller.ex
#	lib/pleroma/web/router.ex

2019-04-02 14:05:34 +03:00

..

mix/tasks/pleroma

change Repo.get(User, id) => User.get_by_id(id)

2019-04-02 17:01:26 +07:00

pleroma

Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

2019-04-02 14:05:34 +03:00

jason_types.ex

Format the code.

2018-03-30 15:01:53 +02:00

transports.ex

Format the code.

2018-03-30 15:01:53 +02:00

xml_builder.ex

Format the code.

2018-03-30 15:01:53 +02:00