Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2...
[akkoma] / test / web / admin_api /
2018-12-02 rinpatchMerge branch 'develop' into fix/theora-detection-read...
2018-12-01 kaniiniMerge branch 'validate-user-info' into 'develop'
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-12-01 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-12-01 lainFix admin api.
2018-11-30 lainMerge remote-tracking branch 'origin' into validate...
2018-11-27 kaniiniMerge branch 'ogg-theora-detection' into 'develop'
2018-11-22 kaniiniMerge branch 'feature/admin-api' into 'develop'
2018-11-17 Haelwenn (lanodan... Web.AdminAPI.AdminAPIControllerTest: New Test