2018-12-01 | rinpatch | Attempt to resolve merge conflict | blob | commitdiff | raw |
2018-11-27 | kaniini | Merge branch 'ogg-theora-detection' into 'develop' | blob | commitdiff | raw |
2018-11-22 | kaniini | Merge branch 'feature/admin-api' into 'develop' | blob | commitdiff | raw |
2018-11-20 | Haelwenn | Merge branch 'feature/retry-queue' into 'develop' | blob | commitdiff | raw |
2018-11-18 | kaniini | Merge branch 'update/pleroma-fe-20181118' into 'develop' | blob | commitdiff | raw |
2018-11-18 | William Pitcock | update pleroma frontend | blob | commitdiff | raw |