Merge remote-tracking branch 'upstream/master'
No related branches found
No related tags found
Showing
- app/assets/javascripts/components/actions/accounts.jsx 6 additions, 5 deletionsapp/assets/javascripts/components/actions/accounts.jsx
- app/assets/javascripts/components/actions/timelines.jsx 6 additions, 5 deletionsapp/assets/javascripts/components/actions/timelines.jsx
- app/assets/javascripts/components/components/column_back_button.jsx 40 additions, 0 deletions.../javascripts/components/components/column_back_button.jsx
- app/assets/javascripts/components/containers/mastodon.jsx 2 additions, 2 deletionsapp/assets/javascripts/components/containers/mastodon.jsx
- app/assets/javascripts/components/features/account/components/header.jsx 3 additions, 3 deletions...scripts/components/features/account/components/header.jsx
- app/assets/javascripts/components/features/account/index.jsx 2 additions, 0 deletionsapp/assets/javascripts/components/features/account/index.jsx
- app/assets/javascripts/components/features/status/index.jsx 12 additions, 6 deletionsapp/assets/javascripts/components/features/status/index.jsx
- app/assets/javascripts/components/reducers/timelines.jsx 6 additions, 6 deletionsapp/assets/javascripts/components/reducers/timelines.jsx
- app/controllers/api_controller.rb 1 addition, 1 deletionapp/controllers/api_controller.rb
- app/models/feed.rb 2 additions, 3 deletionsapp/models/feed.rb
Loading
Please register or sign in to comment