Merge branch 'master' into develop

2013-06-15 13:15:45 -05:00
parent 84cc247f98 08cb97fa6d
commit 129d06dffd
2 changed files with 6 additions and 5 deletions
--- a/app/views/hello.php
+++ b/app/views/hello.php
@@ -4,7 +4,7 @@
    <meta charset="UTF-8">
    <title>Laravel PHP Framework</title>
    <style>
-        @import url(http://fonts.googleapis.com/css?family=Lato:300,400,700);
+        @import url(//fonts.googleapis.com/css?family=Lato:300,400,700);

        body {
            margin:0;