Merge branch 'develop' into feature/polls-2-electric-boogalo
[akkoma] / priv / static / emoji / 1f919-1f3fd.svg
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
2017-12-09 Roger BraunMerge branch 'develop' into feature/activitypub
2017-11-16 Roger BraunAdd mastodon emoji folder.