Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma-fe
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

ff9142d7

Commit ff9142d7 authored 7 years ago by Shpuld Shpuldson

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/sidepanel-independent-scrolling

parents 83205b8c 0379ad3a

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

README.md 1 addition, 1 deletion

README.md
src/components/conversation/conversation.js 8 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 30 additions, 1 deletion

src/components/status/status.js
src/components/status/status.vue 5 additions, 7 deletions

src/components/status/status.vue
src/components/user_card_content/user_card_content.vue 2 additions, 3 deletions

src/components/user_card_content/user_card_content.vue

with 47 additions and 13 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