Resolve merge conflict
[akkoma] / lib / pleroma / list.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-18 lambdaMerge branch 'feature/new-user-routes' into 'develop'
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-10 lambdaMerge branch 'fix_empty_bio_crash' into 'develop'
2018-12-10 lambdaMerge branch 'fix/config-md-typos' into 'develop'
2018-12-10 lambdaMerge branch 'support/bugfix_272' into 'develop'
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into...
2018-12-10 lambdaMerge branch 'anonymize-filter-text' into 'develop'
2018-12-10 lambdaMerge branch 'develop' into 'fix/mix-task-uploads-modul...
2018-12-10 lambdaMerge branch 'parallel588/pleroma-support/compile_warni...
2018-12-09 Maksim Pechnikovfix compile warnings
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-10-20 ealMerge branch 'pleroma-list-belongs' into 'develop'
2018-10-19 AkiraFukushimaAdd a test for List.get_lists_account_belongs
2018-10-18 AkiraFukushimaAdd an endpoint /api/v1/accounts/:id/lists to get lists...
2018-08-16 kaniiniMerge branch 'fix/put-repeats-at-activitypub-outbox...
2018-06-16 squidboiMerge branch 'develop' into feature/configurable-blocks
2018-06-16 lambdaMerge branch 'feature/configure-mrf-rejectnonpublic...
2018-06-14 lambdaMerge branch 'feature/twitterapi-unrepeat' into 'develop'
2018-06-12 lambdaMerge branch 'develop' into 'develop'
2018-06-12 lambdaMerge branch 'feature/list-streaming' into 'develop'
2018-05-30 ealMastoAPI: Add streaming for lists.
2018-05-26 lainMerge branch 'develop' into csaurus/pleroma-feature...
2018-05-24 lambdaMerge branch 'feature/lists' into 'develop'
2018-05-24 ealMastoAPI: add lists.
2018-05-24 ealMastoAPI: add lists.