Attempt to resolve merge conflict
[akkoma] / test / web / federator_test.exs
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-11-27 kaniiniMerge branch 'ogg-theora-detection' into 'develop'
2018-11-22 kaniiniMerge branch 'feature/admin-api' into 'develop'
2018-11-17 lambdaMerge branch 'security/spoofing-hardening' into 'develop'
2018-11-17 William Pitcocktests: federator: fix formatting
2018-11-17 William Pitcocktest: add sanity tests for federator handling of AP...
2018-11-15 Hakaba HitoyoMerge remote-tracking branch 'official/develop' into...
2018-11-10 kaniiniMerge branch 'tests/prismo-url-map' into 'develop'
2018-11-06 kaniiniMerge branch 'patch-2' into 'develop'
2018-11-06 kaniiniMerge branch 'unify-mastodon-oauth' into 'develop'
2018-11-06 kaniiniMerge branch 'runtime-router' into 'develop'
2018-11-06 lambdaMerge branch 'remove-config-agent' into 'develop'
2018-11-06 hrefSmall wrapper module around Application.get_env/put_env
2018-11-06 hrefGet rid of Pleroma.Config in favor of Application
2018-11-01 kaniiniMerge branch 'feature/relay-tests' into 'develop'
2018-11-01 lainTest Relay, switch to runtime configuration.
2017-12-11 lambdaMerge branch 'fix/tootdon-mentions' into 'develop'
2017-12-11 hrefMerge remote-tracking branch 'upstream/develop' into...
2017-12-09 Roger BraunMerge branch 'develop' into feature/activitypub
2017-12-09 Roger BraunMerge branch 'feature/user_deletion' into develop
2017-12-05 Lain IwakuraAdd basic queue prioritization.