Merge branch 'develop' into 'develop'
[akkoma] / lib / mix / tasks / pleroma / sample_config.eex
2018-12-16 HaelwennMerge branch 'develop' into 'develop'
2018-12-16 ealMerge branch 'fix/masto-put-settings' into 'develop'
2018-12-15 lambdaMerge branch 'bugfix/webfinger-jrd' into 'develop'
2018-12-15 lambdaMerge branch 'fix/views-ignore-unhandled-activites...
2018-12-15 lambdaMerge branch 'tests-warning-as-errors' into 'develop'
2018-12-15 lambdaMerge branch 'feature/mix-task-instance-port-specificat...
2018-12-15 Rin ToshakaAllow port specification in instance.ex
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into...
2018-12-07 lambdaMerge branch '394_user_tags' into 'develop'
2018-12-06 kaniiniMerge branch 'refactor/mix-tasks' into 'develop'
2018-12-06 Rin ToshakaMerge develop
2018-12-05 Rin ToshakaMerge develop to refactor/mix-tasks
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-08-23 JortyRefactor Mix tasks