mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-03 12:03:57 +00:00
f513317ba2
Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns. |
||
|---|---|---|
| .. | ||
| admin | ||
| settings | ||
| application_helper.rb | ||
| flashes_helper.rb | ||
| home_helper.rb | ||
| instance_helper.rb | ||
| jsonld_helper.rb | ||
| routing_helper.rb | ||
| settings_helper.rb | ||
| stream_entries_helper.rb | ||