[#468] Merged `upstream/develop`, resolved conflicts.
[akkoma] / installation / pleroma.service
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-11 Karen KonouMerge branch 'develop' into feature/thread-muting
2019-02-10 kaniiniMerge branch 'update-mastofe/glitch-soc-2019-02-10...
2019-02-10 kaniiniMerge branch 'feather_mention' into 'develop'
2019-02-10 kaniiniMerge branch 'fix/credo-issues' into 'develop'
2019-02-10 kaniiniMerge branch 'update-service-files-of-openrc-and-system...
2019-02-10 shibayashiUpdate service files of OpenRC and systemd to new recom...
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop'
2019-01-25 kaniiniMerge branch 'fix/tusky-dm' into 'develop'
2019-01-23 kaniiniMerge branch 's3-namespace' into 'develop'
2019-01-20 lambdaMerge branch 'i1t/pleroma-477_user_search_improvements...
2019-01-19 kaniiniMerge branch 'bugfix/improve-boost-targeting' into...
2019-01-19 kaniiniMerge branch '491_full_mentions_in_user_bio' into ...
2019-01-18 rinpatchFix merge conflict
2019-01-17 kaniiniMerge branch '502_instance_stats_active_users_count_fix...
2019-01-17 kaniiniMerge branch 'bad-copy-paste' into 'develop'
2019-01-17 kaniiniMerge branch 'attachment-links' into 'develop'
2019-01-17 kaniiniMerge branch 'change-mix-location' into 'develop'
2019-01-17 shibayashiAdd comments and change default path of the Mix binary.
2019-01-13 rinpatchResolve merge conflict
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2018-12-31 kaniiniMerge branch 'features/admin-api-user-views' into ...
2018-12-30 Rin ToshakaResolve merge conflict
2018-12-29 kaniiniMerge branch 'carrot-bullying' into 'develop'
2018-12-29 kaniiniMerge branch '483_blocks_import_export' into 'develop'
2018-12-29 kaniiniMerge branch '471_invalid_accounts_rendering' into...
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-28 shibayashiSecurity/Drops the sysadmin privilege from the daemon
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-11-15 Hakaba HitoyoMerge remote-tracking branch 'official/develop' into...
2018-11-14 kaniiniMerge branch 'twitter-api-direct-messages' into 'develop'
2018-11-13 lambdaMerge branch 'security/cookie-hardening' into 'develop'
2018-11-13 lambdaMerge branch 'add-MIX_ENV-to-systemd-example' into...
2018-11-12 shibayashiAdd MIX_ENV=prod
2018-10-25 kaniiniMerge branch 'finmoji-optional' into 'develop'
2018-10-25 kaniiniMerge branch 'update-pleroma-frontend' into 'develop'
2018-10-25 kaniiniMerge branch 'security/add-security-directives-to-syste...
2018-10-24 shibayashiAdd a little bit more detail in the comments.
2018-10-24 shibayashiAdd some security related directives to the systemd...
2018-05-24 lambdaMerge branch 'feature/lists' into 'develop'
2018-05-22 csaurusMerge branch 'develop' into feature/mstdn-direct-api
2018-05-13 lambdaMerge branch 'feature/unrepeats' into 'develop'
2018-05-13 lainMerge branch 'develop' into kaniini/pleroma-bugfix...
2018-05-13 lambdaMerge branch 'patch-2' into 'develop'
2018-05-13 lambdaMerge branch 'feld-varnish' into 'develop'
2018-05-13 lambdaMerge branch 'feature/chain-policies' into 'develop'
2018-05-13 lambdaMerge branch 'no-self-notification' into 'develop'
2018-05-11 lambdaMerge branch 'patch-1' into 'develop'
2018-05-11 NormandyRemove alias directive in service file
2017-09-01 lambadalambdaMerge branch 'hj.doc-install' into 'develop'
2017-08-07 Henry JamesonFirst attempt at installation documentation