Merge branch 'userfeed-fe-fallback' into 'develop'
[akkoma] / priv / static / emoji /
2021-11-15 lainMerge branch 'userfeed-fe-fallback' into 'develop'
2021-10-06 HaelwennMerge branch 'bugfix/crypt-pragma' into 'develop'
2021-10-06 HaelwennMerge branch 'from/develop/tusooa/add-remove-emails...
2021-09-07 HaelwennMerge branch 'remove/mastofe' into 'develop'
2021-08-06 Sean KingMerge branch 'develop' of git.pleroma.social:pleroma...
2021-07-10 Sean KingMerge develop branch upstream
2021-06-04 Sean KingFix merge conflicts with upstream
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-17 Sean KingRemove Twemoji stuff from MastoFE
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable'
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop'
2021-01-19 rinpatchMerge branch 'stable' into mergeback/2.2.2
2021-01-13 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-01-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-01-08 lainMerge branch 'fix/missing_emoji_steal_dir' into 'develop'
2021-01-07 lainMerge branch 'object-normalize-refactor' into 'develop'
2021-01-05 feldMerge branch 'fix/mediaproxy-config-descriptions' into...
2021-01-05 lainMerge branch 'fix/emoji-encoding' into 'develop'
2021-01-05 Mark FelderAdd dinosaur gif from https://gifs.cc
2020-05-18 lainMerge branch 'docs/storing-remote-media' into 'develop'
2020-05-14 lainMerge branch 'features/openrc-console' into 'develop'
2020-03-19 lainMerge branch 'remake-remodel' into develop
2020-03-13 rinpatchMerge branch 'feature/mastofe-admin-scope' into 'develop'
2020-03-09 lainMerge branch 'patch-1' into 'develop'
2020-03-08 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-03-08 rinpatchMerge branch 'release/2.0.0' into 'stable'
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-04 lainMerge branch 'fix/no-email-no-fail' into 'develop'
2020-03-02 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-03-02 lainMerge branch 'prepared-statements-settings' into 'develop'
2020-03-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-03-02 Egor KislitsynMerge branch 'develop' into fix/signup-without-email
2020-03-01 Alexander StrizhakovMerge branch 'develop' into gun
2020-02-29 rinpatchMerge branch 'rate-limiter-runtime-settings' into ...
2020-02-29 rinpatchMerge branch 'chore/update-cachex' into 'develop'
2020-02-29 rinpatchMerge branch 'mastofe/bundle-2020-01-20' into 'develop'
2020-02-29 Haelwenn (lanodan... MastoFE: Bundle 2020-01-20
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-01 Alex SMerging with develop
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop'
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-03-27 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-03-25 lainMerge remote-tracking branch 'origin/develop' into...
2019-03-24 rinpatchMerge branch 'fix/eldap-warnings' into 'develop'
2019-03-22 lambdaMerge branch 'safe-mentions' into 'develop'
2019-03-22 kaniiniMerge branch 'safe-mentions' into 'develop'
2019-03-21 rinpatchMerge branch 'ecto-3-migration' into 'develop'
2019-03-21 kaniiniMerge branch 'imageoptim' into 'develop'
2019-03-19 optikfluffelused imageOptim to reduce size of image files
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-09-20 kaniiniMerge branch 'task-204-on-options-request' into 'develop'
2018-09-20 HaelwennMerge branch 'bump-mastofe-2018-09-20' into 'develop'
2018-09-20 Haelwenn (lanodan... Update mastodon frontend
2018-02-11 Roger BraunMerge branch 'develop' into feature/activitypub
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-12-09 Roger BraunMerge branch 'develop' into feature/activitypub
2017-11-16 Roger BraunAdd mastodon emoji folder.
2017-09-16 Roger BraunMake emoji configurable in files.