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

ce273c08

Commit ce273c08 authored 8 years ago by Eugen Rochko

Downloads
- Plain Diff

Merge branch 'hoodiek-master'

parents ccb8ac85 a012e4c7

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/components/components/column_collapsable.jsx 1 addition, 1 deletion

.../javascripts/components/components/column_collapsable.jsx
app/assets/javascripts/components/components/status_content.jsx 10 additions, 1 deletion

...sets/javascripts/components/components/status_content.jsx
app/views/api/v1/statuses/_mention.rabl 4 additions, 3 deletions

app/views/api/v1/statuses/_mention.rabl

with 15 additions and 5 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