Merge branch 'develop' into feature/account-export
[akkoma] / lib / pleroma / web / pleroma_api / controllers / emoji_file_controller.ex
2020-10-14 Mark FelderMerge branch 'develop' into feature/account-export
2020-10-13 Mark FelderMerge branch 'develop' into feature/gen-magic
2020-10-13 Mark FelderMerge branch 'develop' into refactor/locked_user_field
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-06 rinpatchMerge branch 'filtering-following' into 'develop'
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 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