Merge branch 'mnt' into 'master'

Mnt See merge request !2

Merge branch 'mnt' into 'master'
Mnt See merge request !2
b85aa245 · Wolfgang Knopki · 2fc14e1e · fff0340f · b85aa245 · b85aa245
Commit b85aa245 authored 4 years ago by Wolfgang Knopki
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 246 additions and 349 deletions
+246 -349
--- a/views/partials/tool/object-options.html
+++ b/views/partials/tool/object-options.html
--- a/views/partials/tool/search.html
+++ b/views/partials/tool/search.html
--- a/views/partials/tool/shapes.html
+++ b/views/partials/tool/shapes.html
--- a/views/partials/tool/text-formats.html
+++ b/views/partials/tool/text-formats.html
--- a/views/partials/tool/text-styles.html
+++ b/views/partials/tool/text-styles.html
--- a/views/partials/tool/toolbar-elements.html
+++ b/views/partials/tool/toolbar-elements.html
--- a/views/partials/tool/toolbar-object.html
+++ b/views/partials/tool/toolbar-object.html
--- a/views/partials/tool/toolbar-social.html
+++ b/views/partials/tool/toolbar-social.html
--- a/views/partials/tool/toolbar-text.html
+++ b/views/partials/tool/toolbar-text.html
--- a/views/partials/tool/zones.html
+++ b/views/partials/tool/zones.html
--- a/views/public/contact.html
+++ b/views/public/contact.html
--- a/views/public/privacy.html
+++ b/views/public/privacy.html
--- a/views/public/terms.html
+++ b/views/public/terms.html
--- a/views/space_list.html
+++ b/views/space_list.html
--- a/views/spacedeck.ejs
+++ b/views/spacedeck.ejs
--- a/views/spacedeck.html
+++ b/views/spacedeck.html