Merge branch 'admin-logo-upload' into 'develop'
[akkoma] / config / emoji.txt
2020-01-28 lainMerge branch 'translation/errors-french' into 'develop'
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-08-24 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-13 rinpatchMerge branch 'length-limit-bio' into 'develop'
2019-08-09 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-08-08 lainMerge branch 'feature/digest-email' into 'develop'
2019-08-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-04 kaniiniMerge branch 'feature/relay-list-task' into 'develop'
2019-08-04 kaniiniMerge branch 'remove-longfox-emoji-set' into 'develop'
2019-08-04 Hakaba HitoyoRemove longfox emoji set
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 Alex SMerging with develop
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'features/mastoapi/2.6.0-min_id-pagination...
2019-04-12 lambdaMerge branch 'fix/732-password-align' into 'develop'
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-10 lambdaMerge branch 'feature/767-multiple-use-invite-token...
2019-04-10 SadposterMerge branch 'develop' into feature/user-status-subscri...
2019-04-10 kaniiniMerge branch 'hotfix/fix_undefined_summary' into 'develop'
2019-04-10 kaniiniMerge branch 'notification-pleroma-settings' into ...
2019-04-09 lambdaMerge branch 'bugfix/follower_count' into 'develop'
2019-04-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-04-08 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-08 lambdaMerge branch 'improve_upgrade_user_from_ap_id' into...
2019-04-08 lambdaMerge branch 'twitter_oauth' into 'develop'
2019-04-08 lambdaMerge branch 'feature/770-add-emoji-tags' into 'develop'
2019-04-06 Alex SMerge develop to 770-add-emoji-tags
2019-04-02 Alex SMerging develop into feature/770-add-emoji-tags
2019-04-02 Alex SMerge develop into feature/770-add-emoji-tags
2019-04-01 Alex SAdding tag to emoji ets table
2018-02-11 Roger BraunMerge branch 'develop' into feature/activitypub
2018-01-31 ealRevert renaming emoji.txt
2018-01-31 ealMerge branch 'feature/instance-thumbnail-api' into...
2018-01-31 lambdaMerge branch 'fix/split-custom-emoji' into 'develop'
2018-01-31 ealSplit emoji to default and custom.
2018-01-30 Roger BraunMerge branch 'hakabahitoyo/pleroma-feature/atom-feed...
2018-01-30 lambdaMerge branch 'pr-upstream-http-proxy' into 'develop'
2018-01-30 lambdaMerge branch 'feature/caddyfile' into 'develop'
2018-01-29 Roger BraunMerge branch 'develop' of git.pleroma.social:pleroma...
2018-01-27 lambdaMerge branch 'feature/longfox' into 'develop'
2018-01-26 Hakaba Hitoyoadd longfox emojis
2017-09-16 Roger BraunMake emoji configurable in files.