Merge branch 'hotfix/delete-activities' into 'develop'
[akkoma] / lib / pleroma / config.ex
2019-01-13 rinpatchResolve merge conflict
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop'
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2019-01-01 lambdaMerge branch 'cleanup/admin-api-useless-if' into 'develop'
2019-01-01 lainMerge remote-tracking branch 'origin/develop' into...
2018-12-31 kaniiniMerge branch 'features/admin-api-user-views' into ...
2018-12-31 kaniiniMerge branch 'docs/admin-api' into 'develop'
2018-12-31 kaniiniMerge branch 'maintenance/copyright-2019' into 'develop'
2018-12-31 William Pitcockupdate copyright years to 2019
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-27 kaniiniMerge branch 'feature/create-tombstone-instead-of-delet...
2018-12-25 lambdaMerge branch 'legal-boilerplate' into 'develop'
2018-12-23 William Pitcockadd license boilerplate to pleroma core
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-12-01 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-11-30 kaniiniMerge branch 'feature/reverse-proxy' into 'develop'
2018-11-30 lambdaMerge branch 'config-delete' into 'develop'
2018-11-30 hrefPleroma.Config.delete/1
2018-11-15 Hakaba HitoyoMerge remote-tracking branch 'official/develop' into...
2018-11-10 kaniiniMerge branch 'tests/prismo-url-map' into 'develop'
2018-11-08 lambdaMerge branch 'small-jsonld-refactor' into 'develop'
2018-11-07 kaniiniMerge branch 'feature/qvitter-notifications-dismiss...
2018-11-07 kaniiniMerge branch 'runtime-config' into 'develop'
2018-11-06 kaniiniMerge branch 'patch-2' into 'develop'
2018-11-06 hrefRuntime configuration
2018-11-06 kaniiniMerge branch 'unify-mastodon-oauth' into 'develop'
2018-11-06 kaniiniMerge branch 'runtime-router' into 'develop'
2018-11-06 lambdaMerge branch 'remove-config-agent' into 'develop'
2018-11-06 hrefSmall wrapper module around Application.get_env/put_env
2018-11-06 hrefGet rid of Pleroma.Config in favor of Application
2018-11-01 kaniiniMerge branch 'feature/relay-tests' into 'develop'
2018-11-01 lainAdd basic configuration management module.