Revert "Merge branch 'remove/mastofe' into 'develop'"
[akkoma] / installation / pleroma.supervisord
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into...
2019-05-01 Alex SMerging with develop
2019-04-22 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-19 lambdaMerge branch '923_oauth_consumer_refactoring_ci' into...
2019-04-17 Roman ChvanikovMerge branch 'develop' of git.pleroma.social:pleroma...
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-16 kaniiniMerge branch 'feature/788-separate-email-addresses...
2019-04-16 kaniiniMerge branch 'fix/remote-follow-auth' into 'develop'
2019-04-16 HaelwennMerge branch 'bugfix/relax-spam-protection' into 'develop'
2019-04-16 kaniiniMerge branch 'patch-2' into 'develop'
2019-04-16 Dominik V. SalonenAdd supervisord configuration