pleroma-fe/src
Shpuld Shpludson 8a34ff2957 Merge branch 'develop' into 'feat/masto-ws-deletes'
# Conflicts:
#   CHANGELOG.md
#   src/components/status/status.js
#   src/components/status/status.scss
2020-10-01 12:54:54 +00:00
..
assets Use an existing image served by backend instead 2019-02-03 13:30:54 -05:00
boot Merge branch 'direct-conversations' into 'develop' 2020-07-10 09:04:45 +00:00
components Merge branch 'develop' into 'feat/masto-ws-deletes' 2020-10-01 12:54:54 +00:00
directives refactor using Set 2019-10-21 20:57:36 -04:00
hocs Add Chats 2020-07-08 15:21:31 +03:00
i18n Merge branch 'develop' into 'feat/masto-ws-deletes' 2020-10-01 12:54:54 +00:00
lib Linting + docs 2020-06-13 11:53:16 +02:00
modules Merge branch 'develop' into 'feat/masto-ws-deletes' 2020-10-01 12:54:54 +00:00
services Merge branch 'feat/custom-virtual-scrolling' into 'develop' 2020-09-29 10:18:37 +00:00
_variables.scss Add Chats 2020-07-08 15:21:31 +03:00
App.js Address feedback 2020-07-08 15:21:31 +03:00
App.scss scoped back margin-right on icons 2020-09-29 13:13:42 +02:00
App.vue Address feedback 2020-07-08 15:21:31 +03:00
main.js Add Chats 2020-07-08 15:21:31 +03:00
sw.js ServiceWorker: Use clearer variable names 2020-06-19 15:24:06 +02:00