This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

David Yip 2ca965c704 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss		2018-01-19 15:22:10 -06:00
..
assets.rake	…
auto_annotate_models.rake	…
db.rake	…
emojis.rake	…
glitchsoc.rake	…
mastodon.rake	Fix regeneration marker not expiring (#6290)	2018-01-18 20:29:56 +01:00
statistics.rake	…