Commit Graph

2 Commits

Author SHA1 Message Date
Taylor Otwell 7a5bf6f554 Merge branch 'develop' of github.com:laravel/laravel into develop
Conflicts:
	public/css/app.css
	resources/assets/sass/app.scss
	resources/assets/sass/pages/_welcome.scss
	resources/views/layouts/app.blade.php
	resources/views/welcome.blade.php
2014-11-25 14:34:26 -06:00
Taylor Otwell fa978d0525 Working on default app structure. Login views. 2014-11-24 11:42:29 -06:00