Merge branch 'master' into develop

.gitattributes

@@ -1 +1 @@
-* text=auto
+* text=auto

.gitignore

@@ -5,4 +5,4 @@ composer.lock
 .env.local.php
 .env.php
 .DS_Store
-Thumbs.db
+Thumbs.db

CONTRIBUTING.md

@@ -1,3 +1,3 @@
 # Contribution Guidelines
 
-Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository!
+Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository!

app/config/app.php

@@ -54,6 +54,19 @@
 
 	'locale' => 'en',
 
+	/*
+	|--------------------------------------------------------------------------
+	| Application Fallback Locale
+	|--------------------------------------------------------------------------
+	|
+	| The fallback locale determines the locale to use when the current one
+	| is not available. You may change the value to correspond to any of
+	| the language folders that are provided through your application.
+	|
+	*/
+
+	'fallback_locale' => 'en',
+
 	/*
 	|--------------------------------------------------------------------------
 	| Encryption Key

app/config/compile.php

@@ -15,4 +15,4 @@
 
 
 
-);
+);

app/config/mail.php

@@ -24,7 +24,7 @@
 	|
 	| Here you may provide the host address of the SMTP server used by your
 	| applications. A default option is provided that is compatible with
-	| the Postmark mail service, which will provide reliable delivery.
+	| the Mailgun mail service which will provide reliable deliveries.
 	|
 	*/
 
@@ -37,7 +37,7 @@
 	|
 	| This is the SMTP port used by your application to delivery e-mails to
 	| users of your application. Like the host we have set this value to
-	| stay compatible with the Postmark e-mail application by default.
+	| stay compatible with the Mailgun e-mail applications by default.
 	|
 	*/
 

app/config/remote.php

@@ -56,4 +56,4 @@
 
 	),
 
-);
+);

app/config/testing/cache.php

@@ -17,4 +17,4 @@
 
 	'driver' => 'array',
 
-);
+);

app/config/testing/session.php

@@ -18,4 +18,4 @@
 
 	'driver' => 'array',
 
-);
+);

app/config/workbench.php

@@ -28,4 +28,4 @@
 
 	'email' => '',
 
-);
+);

app/controllers/BaseController.php

@@ -15,4 +15,4 @@ protected function setupLayout()
 		}
 	}
 
-}
+}

app/controllers/HomeController.php

@@ -20,4 +20,4 @@ public function showWelcome()
 		return View::make('hello');
 	}
 
-}
+}

app/database/seeds/DatabaseSeeder.php

@@ -14,4 +14,4 @@ public function run()
 		// $this->call('UserTableSeeder');
 	}
 
-}
+}

app/filters.php

@@ -87,4 +87,4 @@
 	{
 		throw new Illuminate\Session\TokenMismatchException;
 	}
-});
+});

app/lang/en/pagination.php

@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 return array(
 
@@ -17,4 +17,4 @@
 
 	'next'     => 'Next &raquo;',
 
-);
+);

app/models/User.php

@@ -49,4 +49,4 @@ public function getReminderEmail()
 		return $this->email;
 	}
 
-}
+}

app/routes.php

@@ -14,4 +14,4 @@
 Route::get('/', function()
 {
 	return View::make('hello');
-});
+});

app/tests/ExampleTest.php

@@ -14,4 +14,4 @@ public function testBasicExample()
 		$this->assertTrue($this->client->getResponse()->isOk());
 	}
 
-}
+}

app/views/emails/auth/reminder.blade.php

@@ -10,4 +10,4 @@
 			To reset your password, complete this form: {{ URL::to('password/reset', array($token)) }}.
 		</div>
 	</body>
-</html>
+</html>

artisan

@@ -21,7 +21,7 @@ require __DIR__.'/bootstrap/autoload.php';
 |--------------------------------------------------------------------------
 |
 | We need to illuminate PHP development, so let's turn on the lights.
-| This bootstrap the framework and gets it ready for use, then it
+| This bootstraps the framework and gets it ready for and then it
 | will load up this application so that we can run it and send
 | the responses back to the browser and delight these users.
 |
@@ -71,4 +71,4 @@ $status = $artisan->run();
 
 $app->shutdown();
 
-exit($status);
+exit($status);

phpunit.xml

@@ -15,4 +15,4 @@
             <directory>./app/tests/</directory>
         </testsuite>
     </testsuites>
-</phpunit>
+</phpunit>

public/robots.txt

@@ -1,2 +1,2 @@
 User-agent: *
-Disallow: 
+Disallow:

readme.md

@@ -1,6 +1,6 @@
 ## Laravel PHP Framework
 
-[![Latest Stable Version](https://poser.pugx.org/laravel/framework/version.png)](https://packagist.org/packages/laravel/framework) [![Total Downloads](https://poser.pugx.org/laravel/framework/d/total.png)](https://packagist.org/packages/laravel/framework) [![Build Status](https://travis-ci.org/laravel/framework.png)](https://travis-ci.org/laravel/framework) [![License](https://poser.pugx.org/laravel/framework/license.png)](https://packagist.org/packages/laravel/framework) 
+[![Latest Stable Version](https://poser.pugx.org/laravel/framework/version.png)](https://packagist.org/packages/laravel/framework) [![Total Downloads](https://poser.pugx.org/laravel/framework/d/total.png)](https://packagist.org/packages/laravel/framework) [![Build Status](https://travis-ci.org/laravel/framework.png)](https://travis-ci.org/laravel/framework) [![License](https://poser.pugx.org/laravel/framework/license.png)](https://packagist.org/packages/laravel/framework)
 
 Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable, creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as authentication, routing, sessions, and caching.