Merge branch 'master' into develop

app/config/app.php

@@ -54,6 +54,19 @@ return array(
 
 	'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 @@ return array(
 
 
 
-);
+);

app/config/mail.php

@@ -24,7 +24,7 @@ return array(
 	|
 	| 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 @@ return array(
 	|
 	| 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 @@ return array(
 
 	),
 
-);
+);

app/config/testing/cache.php

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

app/config/testing/session.php

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

app/config/workbench.php

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

app/controllers/BaseController.php

@@ -15,4 +15,4 @@ class BaseController extends Controller {
 		}
 	}
 
-}
+}

app/controllers/HomeController.php

@@ -20,4 +20,4 @@ class HomeController extends BaseController {
 		return View::make('hello');
 	}
 
-}
+}

app/database/seeds/DatabaseSeeder.php

@@ -14,4 +14,4 @@ class DatabaseSeeder extends Seeder {
 		// $this->call('UserTableSeeder');
 	}
 
-}
+}

app/filters.php

@@ -87,4 +87,4 @@ Route::filter('csrf', function()
 	{
 		throw new Illuminate\Session\TokenMismatchException;
 	}
-});
+});

app/lang/en/pagination.php

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

app/models/User.php

@@ -49,4 +49,4 @@ class User extends Eloquent implements UserInterface, RemindableInterface {
 		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 @@ class ExampleTest extends TestCase {
 		$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>