Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

Conflicts: skolehjem/resources/views/admin/events/create.blade.php
2020-08-07 09:49:31 +02:00
parent 246004ebfd b5fb505eaa
commit 4c2b58f33b
47 changed files with 457 additions and 98 deletions
@@ -47,13 +47,12 @@
                    options: [
                        { model: 'paragraph', title: 'Paragraph', class: 'ck-heading_paragraph' },
                        { model: 'heading1', view: 'h3', title: 'Heading 1', class: 'sde-blue' },
-                        { model: 'heading2', view: 'h4', title: 'Heading 2', class: 'sde-blue' }
+                        { model: 'heading2', view: 'h4', title: 'Heading 2', class: 'sde-blue' },
                    ]
                }
            } )
            .catch( error => {
                console.log( error );
            } );
-
    </script>
@endsection