diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-06-18 20:28:31 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-06-18 20:28:31 +0000 |
| commit | 0cfa28a7de7cd08820d91c9cba769423d8ce8c89 (patch) | |
| tree | 967230faa328d35db7459ad7126ccf5bf3e2ece1 /src/components/settings/settings.vue | |
| parent | 69eff65130170c0cd8fffda45b952d3bec49c218 (diff) | |
| parent | 0eed2ccca8a0980c161bb5a52b211c507e0ffef5 (diff) | |
Merge branch 'feature/polls-attempt-2' into 'develop'
Feature/polls attempt 2
See merge request pleroma/pleroma-fe!826
Diffstat (limited to 'src/components/settings/settings.vue')
| -rw-r--r-- | src/components/settings/settings.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index 7067c508..528c13cc 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -302,4 +302,4 @@ </template> <script src="./settings.js"> -</script> +</script>
\ No newline at end of file |