config/test.exs · 6fe7acd58ecf2e12bc03499ba43351ff111d4385 · normandy / pleroma · GitLab

Snippets Groups Projects

Forked from Pleroma / pleroma

Source project has a limited visibility.

6 years ago
3a3a3996
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs · 3a3a3996
minibikini authored 6 years ago
```
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/federator/federator.ex
```
3a3a3996

History
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
minibikini authored 6 years ago
```
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/federator/federator.ex
```