Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

mastodon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

1b8d3375

Commit 1b8d3375 authored 8 years ago by Eugen Rochko

Downloads
- Plain Diff

Merge branch 'rmhasan-fix_626'

parents 03000fee 4fbdf100

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/components/actions/accounts.jsx 4 additions, 2 deletions

app/assets/javascripts/components/actions/accounts.jsx
app/assets/javascripts/components/actions/cards.jsx 2 additions, 1 deletion

app/assets/javascripts/components/actions/cards.jsx
app/assets/javascripts/components/actions/statuses.jsx 9 additions, 2 deletions

app/assets/javascripts/components/actions/statuses.jsx
app/assets/javascripts/components/features/account_timeline/components/header.jsx 4 additions, 3 deletions

...omponents/features/account_timeline/components/header.jsx
app/assets/javascripts/components/features/status/index.jsx 3 additions, 2 deletions

app/assets/javascripts/components/features/status/index.jsx
app/assets/javascripts/components/middleware/errors.jsx 1 addition, 1 deletion

app/assets/javascripts/components/middleware/errors.jsx
app/assets/javascripts/components/reducers/statuses.jsx 5 additions, 4 deletions

app/assets/javascripts/components/reducers/statuses.jsx

with 28 additions and 15 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment