Merge branch 'bugfix/activitypub-reserialization' into 'develop'
[akkoma] / priv / static / emoji /
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.