Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / lib / pleroma / web / pleroma_api / controllers / emoji_file_controller.ex
2021-01-23 sadposterMerge branch 'develop' of https://git.pleroma.social...
2021-01-20 feldMerge branch 'deprecate-public_endpoint' into 'develop'
2021-01-19 rinpatchMerge branch 'stable' into mergeback/2.2.2
2021-01-15 HaelwennMerge branch 'optimize-command_available' into 'develop'
2021-01-13 HaelwennMerge branch 'chores/bump-copyright' into 'develop'
2021-01-13 Haelwenn (lanodan... Bump Copyright to 2021
2020-12-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-12-29 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-12-23 lainMerge branch 'stable' into mergeback/2.2.1
2020-12-20 rinpatchMerge branch 'bugfix/mastofe-install-script' into ...
2020-12-17 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-12-16 lainMerge branch 'fix/2336-mastoapi-ws-posts-dropping'...
2020-12-15 lainMerge branch 'support/2255_posix_errors' into 'develop'
2020-11-21 feldMerge branch 'libmagic' into 'develop'
2020-11-13 Maksim Pechnikovadded error messages for posix error code
2020-11-12 rinpatchMerge branch 'release/2.2.0' into 'stable'
2020-11-04 lainMerge branch 'default-mrf' into 'develop'
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'ejabberd-pleroma-auth' into 'develop'
2020-11-01 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-10-29 HaelwennMerge branch 'issue/2069' into 'develop'
2020-10-26 HaelwennMerge branch 'docs/ap_c2s' into 'develop'
2020-10-17 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-10-14 Mark FelderMerge branch 'develop' into feature/account-export
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-13 Mark FelderMerge branch 'develop' into feature/gen-magic
2020-10-13 Mark FelderMerge branch 'develop' into chore/elixir-1.11
2020-10-13 Mark FelderMerge branch 'develop' into refactor/locked_user_field
2020-10-13 Mark FelderMerge branch 'develop' into refactor/discoverable_user_...
2020-10-13 feldMerge branch 'feature/1822-files-consistency' into...
2020-10-13 Alexander Strizhakovchanges after rebase
2020-10-12 feldMerge branch 'docs/improve-backup-restore' into 'develop'
2020-10-12 feldMerge branch 'improve/instance-gen' into 'develop'
2020-10-12 feldMerge branch 'chore/copyright-headers' into 'develop'
2020-10-12 Mark FelderAdd missing Copyright headers
2020-10-09 Mark FelderMerge branch 'develop' into feature/gen-magic
2020-10-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-06 rinpatchMerge branch 'filtering-following' into 'develop'
2020-10-02 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-09-25 Mark FelderMerge branch 'develop' into fix/deprecation-warning...
2020-09-25 rinpatchMerge branch 'features/incoming-create-exists' into...
2020-09-24 lainMerge branch 'smol-test' into 'develop'
2020-09-23 Mark FelderMerge branch 'develop' into feature/bulk-confirmation
2020-09-23 lainMerge branch 'user-query/filter-out-internal' into...
2020-09-23 lainMerge branch 'develop' into 'issue/2115'
2020-09-23 Roman ChvanikovMerge develop
2020-09-23 lainMerge branch 'issue/1975' into 'develop'
2020-09-23 lainMerge branch 'develop' into 'issue/1975'
2020-09-22 Maksim PechnikovMerge branch 'develop' into issue/1975
2020-08-22 Maksim Pechnikovupdated errors on add emoji
2020-08-22 Maksim Pechnikovupload emoji zip file
2020-08-19 Maksim Pechnikovadded Pleroma.Web.PleromaAPI.EmojiFileController