Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

e6f91bad

Commit e6f91bad authored 8 years ago by shpuld

Downloads
- Plain Diff

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

parents be2b90df f7a38eb0

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.babelrc 1 addition, 1 deletion

.babelrc
.gitlab-ci.yml 4 additions, 4 deletions

.gitlab-ci.yml
package.json 1 addition, 0 deletions

package.json
src/App.scss 1 addition, 0 deletions

src/App.scss
src/components/notifications/notifications.js 24 additions, 2 deletions

src/components/notifications/notifications.js
src/components/notifications/notifications.vue 3 additions, 2 deletions

src/components/notifications/notifications.vue
src/components/status/status.vue 1 addition, 0 deletions

src/components/status/status.vue
src/main.js 1 addition, 1 deletion

src/main.js
src/modules/config.js 5 additions, 2 deletions

src/modules/config.js
src/modules/statuses.js 9 additions, 1 deletion

src/modules/statuses.js
yarn.lock 197 additions, 214 deletions

yarn.lock

with 247 additions and 227 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