Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2013-06-15 13:15:45 -05:00
commit 129d06dffd
2 changed files with 6 additions and 5 deletions

View File

@ -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;

View File

@ -2,6 +2,7 @@
Options -MultiViews
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^ index.php [L]
</IfModule>