Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / lib / pleroma / emoji /
2019-10-10 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-02 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-09-30 kPheroxMerge remote-tracking branch 'upstream/develop' into...
2019-09-30 Ivan Tashkinov[#1260] Merge remote-tracking branch 'remotes/upstream...
2019-09-30 kaniiniMerge branch 'features/apc2s-media-upload' into 'develop'
2019-09-27 kaniiniMerge branch 'patch-2' into 'develop'
2019-09-27 kaniiniMerge branch 'update/docs-jp' into 'develop'
2019-09-26 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-09-26 Maxim FilippovMerge branch 'develop' into feature/moderation-log...
2019-09-26 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-26 Roman ChvanikovMerge develop
2019-09-26 kaniiniMerge branch 'refactor/notification-controller' into...
2019-09-26 kaniiniMerge branch 'feature/return-link-for-password-reset...
2019-09-26 kaniiniMerge branch 'refactor/user' into 'develop'
2019-09-26 kaniiniMerge branch 'hex-flake-id' into 'develop'
2019-09-26 kaniiniMerge branch 'feature/activities-pagination-by-offset...
2019-09-26 kaniiniMerge branch 'fix/do-not-embed-first-pages-in-collectio...
2019-09-25 rinpatchMerge branch 'hotfix/hackney-1.15.2' into 'develop'
2019-09-25 rinpatchMerge branch 'support/test' into 'develop'
2019-09-25 rinpatchMerge branch 'emoji-packs-create-dir' into 'develop'
2019-09-25 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-09-25 Ekaterina VaartisFix emoji tags for shareable packs to be "pack:{name}"
2019-09-25 lainMerge branch 'issue/1218' into 'develop'
2019-09-25 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-09-07 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-09-06 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-08-31 Maksim Pechnikovadded Emoji struct
2019-08-30 Maksim Pechnikovadded Emoji.Formatter
2019-08-30 MaksimApply suggestion to lib/pleroma/emoji/loader.ex
2019-08-30 Maksim Pechnikovadded code\path fields without html tags in ets
2019-08-30 Maksim Pechnikovdivision emoji.ex on loader.ex and emoji.ex