forked from treehouse/mastodon
392ca0472a
Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes. |
||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| views | ||
| schema.rb | ||
| seeds.rb | ||