Attempt to resolve merge conflict
[akkoma] / priv / static / packs / Montserrat-Regular-080422d4c1328f3407818d25c86cce51.woff2
2017-12-09 Roger BraunMerge branch 'develop' into feature/activitypub
2017-11-12 Roger BraunMerge branch 'develop' of git.pleroma.social:pleroma...
2017-11-12 Roger BraunAdd Mastodon frontend.