Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

e24145e2

Commit e24145e2 authored 6 years ago by Dave LiPuma

Downloads
- Plain Diff

Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into...

Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form

parents 43e97e59 e2e3a65c

No related branches found

No related tags found

2 merge requests!1028`master` refresh with `develop`,!674Issue 433 status reply form

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/components/conversation/conversation.js 2 additions, 2 deletions

src/components/conversation/conversation.js
src/modules/statuses.js 0 additions, 14 deletions

src/modules/statuses.js
src/modules/users.js 13 additions, 13 deletions

src/modules/users.js
src/services/api/api.service.js 75 additions, 35 deletions

src/services/api/api.service.js
src/services/backend_interactor_service/backend_interactor_service.js 4 additions, 4 deletions

.../backend_interactor_service/backend_interactor_service.js
src/services/follow_manipulate/follow_manipulate.js 2 additions, 2 deletions

src/services/follow_manipulate/follow_manipulate.js

with 96 additions and 70 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