Merge branch 'develop' into 'eslint-fix'
# Conflicts: # src/components/post_status_form/post_status_form.vue
No related branches found
No related tags found
Checking pipeline status
Showing
- src/components/post_status_form/post_status_form.vue 23 additions, 143 deletionssrc/components/post_status_form/post_status_form.vue
- src/components/timeline/timeline.js 1 addition, 1 deletionsrc/components/timeline/timeline.js
- src/components/user_profile/user_profile.js 2 additions, 0 deletionssrc/components/user_profile/user_profile.js
- src/i18n/oc.json 33 additions, 11 deletionssrc/i18n/oc.json
- src/modules/statuses.js 3 additions, 2 deletionssrc/modules/statuses.js
- test/unit/specs/modules/statuses.spec.js 2 additions, 2 deletionstest/unit/specs/modules/statuses.spec.js
Loading
Please register or sign in to comment