-
- Downloads
Merge branch 'develop' into 'feature/settings-rollback'
# Conflicts: # CHANGELOG.md
No related branches found
No related tags found
Showing
- CHANGELOG.md 8 additions, 0 deletionsCHANGELOG.md
- build/webpack.dev.conf.js 7 additions, 2 deletionsbuild/webpack.dev.conf.js
- src/api/__mocks__/chat.js 6 additions, 6 deletionssrc/api/__mocks__/chat.js
- src/api/__mocks__/login.js 1 addition, 1 deletionsrc/api/__mocks__/login.js
- src/api/__mocks__/users.js 15 additions, 40 deletionssrc/api/__mocks__/users.js
- src/lang/en.js 13 additions, 7 deletionssrc/lang/en.js
- src/lang/es.js 0 additions, 5 deletionssrc/lang/es.js
- src/lang/oc.js 0 additions, 5 deletionssrc/lang/oc.js
- src/lang/zh.js 0 additions, 5 deletionssrc/lang/zh.js
- src/router/index.js 14 additions, 1 deletionsrc/router/index.js
- src/store/modules/emojiPacks.js 0 additions, 7 deletionssrc/store/modules/emojiPacks.js
- src/store/modules/reports.js 5 additions, 5 deletionssrc/store/modules/reports.js
- src/store/modules/users.js 5 additions, 5 deletionssrc/store/modules/users.js
- src/styles/index.scss 0 additions, 29 deletionssrc/styles/index.scss
- src/utils/clipboard.js 1 addition, 1 deletionsrc/utils/clipboard.js
- src/utils/request.js 17 additions, 12 deletionssrc/utils/request.js
- src/views/charts/keyboard.vue 0 additions, 23 deletionssrc/views/charts/keyboard.vue
- src/views/charts/line.vue 0 additions, 23 deletionssrc/views/charts/line.vue
- src/views/charts/mixChart.vue 0 additions, 23 deletionssrc/views/charts/mixChart.vue
- src/views/clipboard/index.vue 0 additions, 45 deletionssrc/views/clipboard/index.vue
Loading
Please register or sign in to comment