Merge branch 'master' into develop

2016-12-29 13:03:32 +00:00
parent 077d404c5f b43890c11f
commit 36875bb98e
8 changed files with 35 additions and 19 deletions
--- a/resources/assets/js/components/Example.vue
+++ b/resources/assets/js/components/Example.vue
@@ -17,7 +17,7 @@
 <script>
    export default {
        mounted() {
-            console.log('Component ready.')
+            console.log('Component mounted.')
        }
    }
 </script>