mirror of https://github.com/tootsuite/mastodon
cd99255698
Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both. |
||
|---|---|---|
| .. | ||
| admin | ||
| settings | ||
| application_helper.rb | ||
| flashes_helper.rb | ||
| home_helper.rb | ||
| instance_helper.rb | ||
| jsonld_helper.rb | ||
| mailer_helper.rb | ||
| routing_helper.rb | ||
| settings_helper.rb | ||
| stream_entries_helper.rb | ||