Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
[akkoma] / config / emoji.txt
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.