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

..

login.blade.php

Merge branch 'develop' of github.com:laravel/laravel into develop

2014-11-25 14:34:26 -06:00

password.blade.php

Merge branch 'develop' of github.com:laravel/laravel into develop

2014-11-25 14:34:26 -06:00

register.blade.php

Merge branch 'develop' of github.com:laravel/laravel into develop

2014-11-25 14:34:26 -06:00

reset.blade.php

Merge branch 'develop' of github.com:laravel/laravel into develop

2014-11-25 14:34:26 -06:00