Merge branch 'master' into develop

129d06df · Taylor Otwell · 84cc247f · 08cb97fa · 129d06df · 129d06df
Commit 129d06df authored Jun 15, 2013 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

hello.php app/views/hello.php +1 -1

.htaccess public/.htaccess +5 -4

No files found.
--- 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;

--- a/public/.htaccess
+++ b/public/.htaccess
 <IfModule mod_rewrite.c>
-	Options -MultiViews
-	RewriteEngine On
+    Options -MultiViews
+    RewriteEngine On

-	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteRule ^ index.php [L]
+	RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^ index.php [L]
 </IfModule>
\ No newline at end of file