![]() # Conflicts: # CHANGELOG.md |
il y a 4 ans | |
---|---|---|
.. | ||
tasks/pleroma | Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes | il y a 4 ans |
pleroma.ex | Some tasks try to set log level in test environment, but we were stripping logs belog :warn. | il y a 4 ans |