Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

admin-fe
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

2c40e2de

Commit 2c40e2de authored 4 years ago by Angelina Filippova

Downloads
- Plain Diff

Merge branch 'develop' into 'feature/remote-emoji-pagination'

# Conflicts:
#   CHANGELOG.md

parents 71536f6b 3471f888

No related branches found

No related tags found

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 6 additions, 0 deletions

CHANGELOG.md
src/api/relays.js 4 additions, 4 deletions

src/api/relays.js
src/assets/custom-theme/index.css 1 addition, 1 deletion

src/assets/custom-theme/index.css
src/lang/en.js 3 additions, 1 deletion

src/lang/en.js
src/store/modules/relays.js 4 additions, 5 deletions

src/store/modules/relays.js
src/views/settings/components/Relays.vue 23 additions, 12 deletions

src/views/settings/components/Relays.vue
src/views/settings/styles/main.scss 2 additions, 1 deletion

src/views/settings/styles/main.scss

with 43 additions and 24 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