You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		6 years ago
..
mix/tasks/pleroma	change `Repo.get(User, id)` => `User.get_by_id(id)`	6 years ago
pleroma	Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	6 years ago
jason_types.ex	Format the code.	7 years ago
transports.ex	Format the code.	7 years ago
xml_builder.ex	Format the code.	7 years ago