Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

1b79ae09

Commit 1b79ae09 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/notification-improvements

parents 5ad4d043 d389d3a7

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/App.js 3 additions, 1 deletion

src/App.js
src/App.vue 1 addition, 0 deletions

src/App.vue
src/components/status/status.vue 19 additions, 2 deletions

src/components/status/status.vue
src/components/user_finder/user_finder.js 18 additions, 0 deletions

src/components/user_finder/user_finder.js
src/components/user_finder/user_finder.vue 13 additions, 0 deletions

src/components/user_finder/user_finder.vue
src/services/api/api.service.js 10 additions, 1 deletion

src/services/api/api.service.js
src/services/backend_interactor_service/backend_interactor_service.js 4 additions, 1 deletion

.../backend_interactor_service/backend_interactor_service.js

with 68 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