3e686beaea
Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it. |
||
|---|---|---|
| .. | ||
| 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 | ||