Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2013-06-15 13:15:45 -05:00
parent 84cc247f98 08cb97fa6d
commit 129d06dffd
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/hello.php
View File

@ -4,7 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Laravel PHP Framework</title> <title>Laravel PHP Framework</title>
<style> <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 { body {
margin:0; margin:0;

1
public/.htaccess
View File

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