Merge branch 'worker-messages' into 'develop'
[akkoma] / lib / pleroma / mime.ex
2020-03-19 lainMerge branch 'remake-remodel' into develop
2020-03-13 rinpatchMerge branch 'feature/mastofe-admin-scope' into 'develop'
2020-03-13 rinpatchMerge branch 'docs/direct_conversation_id' into 'develop'
2020-03-13 rinpatchMerge branch 'static-accept-missing' into 'develop'
2020-03-09 lainMerge branch 'patch-1' into 'develop'
2020-03-08 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-03-08 rinpatchMerge branch 'release/2.0.0' into 'stable'
2020-03-07 rinpatchMerge branch 'restart-fix-for-mix-tasks' into 'develop'
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-04 lainMerge branch 'fix/no-email-no-fail' into 'develop'
2020-03-03 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-02 lainMerge branch 'prepared-statements-settings' into 'develop'
2020-03-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-03-02 Egor KislitsynMerge branch 'develop' into fix/signup-without-email
2020-03-02 HaelwennMerge branch 'feature/1482-activity_pub_transactions...
2020-03-02 HaelwennMerge branch 'chores/bump-copyright' into 'develop'
2020-03-02 Haelwenn (lanodan... Bump copyright years of files changed after 2020-01-07
2020-02-29 Alexander StrizhakovMerge branch 'develop' into gun
2020-02-26 lainMerge branch 'feat/instance-gen-improvements' into...
2020-02-25 rinpatchMerge branch 'fix/dialyzer-warnings' into 'develop'
2020-02-25 Egor KislitsynFix Dialyzer warnings
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-06 rinpatchMerge branch 'fix/activitypub-user-view-badmap' into...
2019-02-05 kaniiniMerge branch 'fix-dm-index' into 'develop'
2019-02-05 kaniiniMerge branch 'feature/split-hide-network-v2' into ...
2019-02-04 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-04 rinpatchMerge branch 'hotfix/hellthread-deprecation-warning...
2019-02-04 kaniiniMerge branch 'mime-riff' into 'develop'
2019-02-04 hrefMime: detect RIFF formats (wave, webp, avi)
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/mix-task-uploads-moduledoc' into...
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-02 rinpatchMerge branch 'develop' into fix/theora-detection-read...
2018-12-02 rinpatchChange @read_bytes to 35
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 hrefMIME: video/audio ogg detection
2018-11-30 hrefUploads fun, part. 2