Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

pleroma-fe
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

31c0a2df

Commit 31c0a2df authored 8 years ago by shpuld

Downloads
- Plain Diff

Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into...

Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/load-new-statuses-in-heading

parents e19bfb9a 67c22276

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/components/conversation/conversation.js 3 additions, 0 deletions

src/components/conversation/conversation.js
src/components/conversation/conversation.vue 1 addition, 1 deletion

src/components/conversation/conversation.vue
src/components/status/status.js 4 additions, 2 deletions

src/components/status/status.js
src/components/status/status.vue 8 additions, 1 deletion

src/components/status/status.vue
src/components/status_or_conversation/status_or_conversation.vue 1 addition, 1 deletion

...ponents/status_or_conversation/status_or_conversation.vue
src/main.js 4 additions, 1 deletion

src/main.js

with 21 additions and 6 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