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 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md		5 years ago
..
tasks/pleroma	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes	5 years ago
pleroma.ex	Some tasks try to set log level in test environment, but we were stripping logs belog :warn.	5 years ago