Merge branch 'simple_policy_reasons_for_instance_specific_policies' into 'develop'
[akkoma] / priv / static / emoji / 1f469-200d-1f692.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.